Author: jasvir Date: Thu Sep 23 05:56:16 2010 New Revision: 1000330 URL: http://svn.apache.org/viewvc?rev=1000330&view=rev Log: Description * remove unnecessary words from the reserved keywords list * removes caja's opensocial.GadgetRewriterException and instead use Shindig's own rewriting exception for better logging.
[email protected] Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java shindig/trunk/pom.xml Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java?rev=1000330&r1=1000329&r2=1000330&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java (original) +++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java Thu Sep 23 05:56:16 2010 @@ -35,6 +35,8 @@ import com.google.caja.plugin.PipelineMa import com.google.caja.plugin.PluginCompiler; import com.google.caja.plugin.PluginMeta; import com.google.caja.plugin.UriFetcher; +import com.google.caja.plugin.LoaderType; +import com.google.caja.plugin.UriEffect; import com.google.caja.plugin.UriPolicy; import com.google.caja.render.Concatenator; import com.google.caja.render.JsMinimalPrinter; Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java?rev=1000330&r1=1000329&r2=1000330&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java (original) +++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java Thu Sep 23 05:56:16 2010 @@ -23,13 +23,14 @@ import com.google.caja.lexer.FetchedData import com.google.caja.lexer.InputSource; import com.google.caja.lexer.TokenConsumer; import com.google.caja.lexer.escaping.Escaping; -import com.google.caja.opensocial.GadgetRewriteException; import com.google.caja.parser.html.Dom; import com.google.caja.parser.html.Namespaces; import com.google.caja.parser.js.CajoledModule; import com.google.caja.plugin.PipelineMaker; import com.google.caja.plugin.PluginCompiler; import com.google.caja.plugin.PluginMeta; +import com.google.caja.plugin.LoaderType; +import com.google.caja.plugin.UriEffect; import com.google.caja.plugin.UriFetcher; import com.google.caja.plugin.UriPolicy; import com.google.caja.render.Concatenator; @@ -140,7 +141,9 @@ public class CajaContentRewriter impleme try { if (!compiler.run()) { - throw new GadgetRewriteException("Gadget has compile errors"); + throw new GadgetException( + GadgetException.Code.MALFORMED_FOR_SAFE_INLINING, + "Gadget has compile errors"); } StringBuilder scriptBody = new StringBuilder(); CajoledModule cajoled = compiler.getJavascript(); @@ -183,7 +186,7 @@ public class CajaContentRewriter impleme mc.documentChanged(); safe = true; HtmlSerialization.attach(doc, htmlSerializer, null); - } catch (GadgetRewriteException e) { + } catch (GadgetException e) { // There were cajoling errors // Content is only used to produce useful snippets with error messages createContainerFor(doc, Modified: shindig/trunk/pom.xml URL: http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=1000330&r1=1000329&r2=1000330&view=diff ============================================================================== --- shindig/trunk/pom.xml (original) +++ shindig/trunk/pom.xml Thu Sep 23 05:56:16 2010 @@ -1479,7 +1479,7 @@ <dependency> <groupId>caja</groupId> <artifactId>caja</artifactId> - <version>r4251</version> + <version>r4280</version> <scope>compile</scope> </dependency> <dependency>
