Author: lryan
Date: Tue Dec 2 00:15:18 2008
New Revision: 722400
URL: http://svn.apache.org/viewvc?rev=722400&view=rev
Log:
Update to newer Caja version. Apply patch from Jasvir Nagra for SHINDIG-714
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
incubator/shindig/trunk/pom.xml
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java?rev=722400&r1=722399&r2=722400&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java
Tue Dec 2 00:15:18 2008
@@ -17,14 +17,12 @@
*/
package org.apache.shindig.gadgets.parse.caja;
-import com.google.caja.lexer.CharProducer;
-import com.google.caja.lexer.CssLexer;
-import com.google.caja.lexer.CssTokenType;
-import com.google.caja.lexer.InputSource;
-import com.google.caja.lexer.ParseException;
-import com.google.caja.lexer.Token;
-import com.google.caja.lexer.TokenConsumer;
-import com.google.caja.lexer.TokenQueue;
+import org.apache.shindig.gadgets.GadgetException;
+import org.apache.shindig.gadgets.parse.GadgetCssParser;
+import org.apache.shindig.gadgets.parse.ParsedCssDeclaration;
+import org.apache.shindig.gadgets.parse.ParsedCssRule;
+
+import com.google.caja.lexer.*;
import com.google.caja.parser.css.CssParser;
import com.google.caja.parser.css.CssTree;
import com.google.caja.reporting.MessageContext;
@@ -32,11 +30,6 @@
import com.google.caja.util.Criterion;
import com.google.inject.Singleton;
-import org.apache.shindig.gadgets.GadgetException;
-import org.apache.shindig.gadgets.parse.GadgetCssParser;
-import org.apache.shindig.gadgets.parse.ParsedCssDeclaration;
-import org.apache.shindig.gadgets.parse.ParsedCssRule;
-
import java.io.StringReader;
import java.net.URI;
import java.net.URISyntaxException;
@@ -163,7 +156,7 @@
private final String value;
private CajaParsedCssDeclaration(CssTree.Declaration declaration) {
- key = declaration.getProperty().getPropertyName();
+ key = declaration.getProperty().getPropertyName().getCanonicalForm();
value = renderCssTreeElement(declaration.getExpr());
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java?rev=722400&r1=722399&r2=722400&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java
Tue Dec 2 00:15:18 2008
@@ -17,18 +17,20 @@
*/
package org.apache.shindig.gadgets.parse.caja;
+import org.apache.shindig.gadgets.GadgetException;
+import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
+import org.apache.shindig.gadgets.parse.HtmlSerializer;
+import org.apache.xml.serialize.HTMLSerializer;
+import org.apache.xml.serialize.OutputFormat;
+
import com.google.caja.lexer.*;
import com.google.caja.parser.html.DomParser;
import com.google.caja.parser.html.DomTree;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.reporting.SimpleMessageQueue;
+import com.google.caja.util.Name;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-import org.apache.shindig.gadgets.GadgetException;
-import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
-import org.apache.shindig.gadgets.parse.HtmlSerializer;
-import org.apache.xml.serialize.HTMLSerializer;
-import org.apache.xml.serialize.OutputFormat;
import org.w3c.dom.*;
import java.io.IOException;
@@ -95,7 +97,7 @@
// Check if doc contains an HTML node. If so just add it and recurse
for (DomTree node : fragment.children()) {
if (node instanceof DomTree.Tag &&
- ((DomTree.Tag)node).getTagName().equalsIgnoreCase("HTML")) {
+ ((DomTree.Tag)node).getTagName().equals(Name.html("HTML"))) {
recurseDocument(htmlDocument, htmlDocument, node);
return htmlDocument;
}
@@ -110,14 +112,14 @@
private static void recurseDocument(Document doc, Node parent, DomTree elem)
{
if (elem instanceof DomTree.Tag) {
DomTree.Tag tag = (DomTree.Tag) elem;
- Element element = doc.createElement(tag.getTagName());
+ Element element = doc.createElement(tag.getTagName().getCanonicalForm());
parent.appendChild(element);
for (DomTree child : elem.children()) {
recurseDocument(doc, element, child);
}
} else if (elem instanceof DomTree.Attrib) {
DomTree.Attrib attrib = (DomTree.Attrib) elem;
- Attr domAttrib = doc.createAttribute(attrib.getAttribName());
+ Attr domAttrib =
doc.createAttribute(attrib.getAttribName().getCanonicalForm());
parent.getAttributes().setNamedItem(domAttrib);
domAttrib.setValue(attrib.getAttribValue());
} else if (elem instanceof DomTree.Text) {
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java?rev=722400&r1=722399&r2=722400&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
Tue Dec 2 00:15:18 2008
@@ -29,11 +29,7 @@
import com.google.caja.lexer.ExternalReference;
import com.google.caja.lexer.FilePosition;
import com.google.caja.lexer.InputSource;
-import com.google.caja.opensocial.DefaultGadgetRewriter;
-import com.google.caja.opensocial.GadgetRewriteException;
-import com.google.caja.opensocial.UriCallback;
-import com.google.caja.opensocial.UriCallbackException;
-import com.google.caja.opensocial.UriCallbackOption;
+import com.google.caja.opensocial.*;
import com.google.caja.reporting.Message;
import com.google.caja.reporting.MessageContext;
import com.google.caja.reporting.MessageQueue;
@@ -91,7 +87,7 @@
DefaultGadgetRewriter rw = new DefaultGadgetRewriter(mq);
CharProducer input = CharProducer.Factory.create(
new StringReader(content.getContent()),
- FilePosition.instance(new InputSource(retrievedUri), 2, 2, 1, 1));
+ FilePosition.instance(new InputSource(retrievedUri), 2, 1, 1));
StringBuilder output = new StringBuilder();
try {
Modified: incubator/shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=722400&r1=722399&r2=722400&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Tue Dec 2 00:15:18 2008
@@ -937,7 +937,7 @@
<dependency>
<groupId>caja</groupId>
<artifactId>caja</artifactId>
- <version>r2438</version>
+ <version>r3034</version>
<scope>compile</scope>
</dependency>
<dependency>
