Much better. Couple of nits.
http://codereview.appspot.com/53052/diff/2001/3007 File java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java (right): http://codereview.appspot.com/53052/diff/2001/3007#newcode243 Line 243: StringBuffer output = new StringBuffer(); Can use JsonSerializer.appendString to do the escaping. http://codereview.appspot.com/53052/diff/2001/3005 File java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/LibraryTagRegistryTest.java (right): http://codereview.appspot.com/53052/diff/2001/3005#newcode82 Line 82: reg.getHandlerFor(foo); I would have expected a test to make sure that I got the right TagHanlder instance here. http://codereview.appspot.com/53052
