[Caja] Caja upgrade to r4280 (issue2194044)

[jasvir]

Reviewers: chirag,

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.
Please review this at http://codereview.appspot.com/2194044/

Affected files:
  M      
java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java
  M      
java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
  M     pom.xml


Index:  
java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
===================================================================
---  
java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java	 
(revision 1000189)
+++  
java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java	 
(working copy)
@@ -23,13 +23,14 @@
 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 @@

       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 @@
         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,
Index:  
java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java
===================================================================
---  
java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java	 
(revision 1000189)
+++  
java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java	 
(working copy)
@@ -35,6 +35,8 @@
 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;
Index: pom.xml
===================================================================
--- pom.xml     (revision 1000189)
+++ pom.xml     (working copy)
@@ -1479,7 +1479,7 @@
       <dependency>
         <groupId>caja</groupId>
         <artifactId>caja</artifactId>
-        <version>r4251</version>
+        <version>r4280</version>
         <scope>compile</scope>
       </dependency>
       <dependency>