You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/03/16 22:56:41 UTC
svn commit: r924016 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/render/
main/java/org/apache/shindig/gadgets/rewrite/
test/java/org/apache/shindig/gadgets/rewrite/
Author: lindner
Date: Tue Mar 16 21:56:41 2010
New Revision: 924016
URL: http://svn.apache.org/viewvc?rev=924016&view=rev
Log:
use ampersand entities to keep htmlunit quiet
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java?rev=924016&r1=924015&r2=924016&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java Tue Mar 16 21:56:41 2010
@@ -242,7 +242,7 @@ public class RenderingGadgetRewriter imp
if (!externForcedLibs.isEmpty()) {
String jsUrl = urlGenerator.getBundledJsUrl(externForcedLibs, context);
Element libsTag = headTag.getOwnerDocument().createElement("script");
- libsTag.setAttribute("src", jsUrl);
+ libsTag.setAttribute("src", StringUtils.replace(jsUrl, "&", "&"));
headTag.appendChild(libsTag);
}
@@ -284,7 +284,7 @@ public class RenderingGadgetRewriter imp
if (!externGadgetLibs.isEmpty()) {
String jsUrl = urlGenerator.getBundledJsUrl(externGadgetLibs, context);
Element libsTag = headTag.getOwnerDocument().createElement("script");
- libsTag.setAttribute("src", jsUrl);
+ libsTag.setAttribute("src", jsUrl.replaceAll("&", "&"));
headTag.appendChild(libsTag);
}
} else {
@@ -329,7 +329,7 @@ public class RenderingGadgetRewriter imp
inlineJs.setLength(0);
}
Element referenceTag = headTag.getOwnerDocument().createElement("script");
- referenceTag.setAttribute("src", theContent);
+ referenceTag.setAttribute("src", theContent.replaceAll("&", "&"));
headTag.appendChild(referenceTag);
} else {
inlineJs.append(theContent).append(";\n");
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java?rev=924016&r1=924015&r2=924016&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java Tue Mar 16 21:56:41 2010
@@ -131,7 +131,7 @@ public class ConcatVisitor implements Do
// with new (concat) URI, immediately ahead of the first elem.
Element firstElem = sourceBatch.get(0);
Element elemConcat = (Element)firstElem.cloneNode(true);
- elemConcat.setAttribute(type.getSrcAttrib(), concatUri.getUri().toString());
+ elemConcat.setAttribute(type.getSrcAttrib(), StringUtils.replace(concatUri.getUri().toString(), "&", "&"));
firstElem.getParentNode().insertBefore(elemConcat, firstElem);
// Now for all Elements, either A) remove them or B) replace each
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java?rev=924016&r1=924015&r2=924016&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java Tue Mar 16 21:56:41 2010
@@ -27,6 +27,7 @@ import com.google.common.collect.Immutab
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.uri.UriBuilder;
import org.apache.shindig.gadgets.rewrite.DomWalker.Visitor.VisitStatus;
@@ -213,7 +214,7 @@ public class ConcatVisitorTest extends D
// Should be left with a single JS node child to parent.
assertEquals(1, parent.getChildNodes().getLength());
Element concatNode = (Element)parent.getChildNodes().item(0);
- Uri concatUri = Uri.parse(concatNode.getAttribute("src"));
+ Uri concatUri = Uri.parse(StringUtils.replace(concatNode.getAttribute("src"), "&", "&"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri.getPath());
@@ -237,7 +238,7 @@ public class ConcatVisitorTest extends D
// Should be left with a single JS node child to parent.
assertEquals(1, parent.getChildNodes().getLength());
Element concatNode = (Element)parent.getChildNodes().item(0);
- Uri concatUri = Uri.parse(concatNode.getAttribute("href"));
+ Uri concatUri = Uri.parse(StringUtils.replace(concatNode.getAttribute("href"), "&", "&"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri.getPath());
@@ -264,7 +265,7 @@ public class ConcatVisitorTest extends D
// Should have been independently concatenated.
assertEquals(1, parent1.getChildNodes().getLength());
Element cn1 = (Element)parent1.getChildNodes().item(0);
- Uri concatUri1 = Uri.parse(cn1.getAttribute("src"));
+ Uri concatUri1 = Uri.parse(StringUtils.replace(cn1.getAttribute("src"), "&", "&"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri1.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri1.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri1.getPath());
@@ -274,7 +275,7 @@ public class ConcatVisitorTest extends D
assertEquals(1, parent2.getChildNodes().getLength());
Element cn2 = (Element)parent2.getChildNodes().item(0);
- Uri concatUri2 = Uri.parse(cn2.getAttribute("src"));
+ Uri concatUri2 = Uri.parse(StringUtils.replace(cn2.getAttribute("src"), "&", "&"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri2.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri2.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri2.getPath());
@@ -301,7 +302,7 @@ public class ConcatVisitorTest extends D
// Should have been independently concatenated.
assertEquals(1, parent1.getChildNodes().getLength());
Element cn1 = (Element)parent1.getChildNodes().item(0);
- Uri concatUri1 = Uri.parse(cn1.getAttribute("href"));
+ Uri concatUri1 = Uri.parse(StringUtils.replace(cn1.getAttribute("href"), "&", "&"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri1.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri1.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri1.getPath());
@@ -311,7 +312,7 @@ public class ConcatVisitorTest extends D
assertEquals(1, parent2.getChildNodes().getLength());
Element cn2 = (Element)parent2.getChildNodes().item(0);
- Uri concatUri2 = Uri.parse(cn2.getAttribute("href"));
+ Uri concatUri2 = Uri.parse(StringUtils.replace(cn2.getAttribute("href"), "&", "&"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri2.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri2.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri2.getPath());
@@ -342,7 +343,7 @@ public class ConcatVisitorTest extends D
// Should have been independently concatenated. Batches #1 and #2 are OK. Middle skipped.
assertEquals(1, parent1.getChildNodes().getLength());
Element cn1 = (Element)parent1.getChildNodes().item(0);
- Uri concatUri1 = Uri.parse(cn1.getAttribute("src"));
+ Uri concatUri1 = Uri.parse(StringUtils.replace(cn1.getAttribute("src"), "&", "&"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri1.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri1.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri1.getPath());
@@ -355,7 +356,7 @@ public class ConcatVisitorTest extends D
assertEquals(1, parent2.getChildNodes().getLength());
Element cn2 = (Element)parent2.getChildNodes().item(0);
- Uri concatUri2 = Uri.parse(cn2.getAttribute("src"));
+ Uri concatUri2 = Uri.parse(StringUtils.replace(cn2.getAttribute("src"), "&", "&"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri2.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri2.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri2.getPath());
@@ -378,7 +379,7 @@ public class ConcatVisitorTest extends D
assertEquals(3, parent.getChildNodes().getLength());
Element jsConcat = (Element)parent.getChildNodes().item(0);
assertEquals("script", jsConcat.getTagName());
- Uri concatUri = Uri.parse(jsConcat.getAttribute("src"));
+ Uri concatUri = Uri.parse(StringUtils.replace(jsConcat.getAttribute("src"), "&", "&"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri.getPath());
@@ -420,7 +421,7 @@ public class ConcatVisitorTest extends D
assertEquals(7, parent.getChildNodes().getLength());
Element jsConcat = (Element)parent.getChildNodes().item(1);
assertEquals("script", jsConcat.getTagName());
- Uri concatUri = Uri.parse(jsConcat.getAttribute("src"));
+ Uri concatUri = Uri.parse(jsConcat.getAttribute("src").replaceAll("&", "&"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri.getPath());