You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by jo...@apache.org on 2009/11/06 02:41:48 UTC
svn commit: r833270 - in /incubator/shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/features/FeatureParser.java
test/java/org/apache/shindig/gadgets/features/FeatureParserTest.java
Author: johnh
Date: Fri Nov 6 01:41:47 2009
New Revision: 833270
URL: http://svn.apache.org/viewvc?rev=833270&view=rev
Log:
If inline="false", don't modify the provided URI at all (just include verbatim)
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureParserTest.java
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java?rev=833270&r1=833269&r2=833270&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java Fri Nov 6 01:41:47 2009
@@ -68,9 +68,17 @@
Element resourceChild = (Element)resourceKids.item(x);
String src = resourceChild.getAttribute("src");
String content = resourceChild.getTextContent();
+ Map<String, String> attribs = getAttribs(resourceChild);
+ Uri source = null;
+ if (src != null && src.length() > 0) {
+ if (!"false".equals(attribs.get("inline"))) {
+ source = parent.resolve(FeatureRegistry.getComponentUri(src));
+ } else {
+ source = Uri.parse(src);
+ }
+ }
resources.add(new ParsedFeature.Resource(
- src == null || src.length() == 0 ? null :
- parent.resolve(FeatureRegistry.getComponentUri(src)),
+ source,
src != null && src.length() != 0 ? null : content,
getAttribs(resourceChild)));
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureParserTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureParserTest.java?rev=833270&r1=833269&r2=833270&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureParserTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureParserTest.java Fri Nov 6 01:41:47 2009
@@ -48,6 +48,7 @@
" </container>" +
" <other_type>" +
" <script src=\"http://www.apache.org/two.js\"/>" +
+ " <script src=\"//extern/unchanged.dat\" inline=\"false\"/>" +
" </other_type>" +
"</feature>";
FeatureParser.ParsedFeature parsed = new FeatureParser().parse(parent, featureXml);
@@ -102,10 +103,13 @@
FeatureParser.ParsedFeature.Bundle bundle4 = parsed.getBundles().get(3);
assertEquals("other_type", bundle4.getType());
assertEquals(0, bundle4.getAttribs().size());
- assertEquals(1, bundle4.getResources().size());
+ assertEquals(2, bundle4.getResources().size());
assertNull(bundle4.getResources().get(0).getContent());
assertEquals(Uri.parse("http://www.apache.org/two.js"),
bundle4.getResources().get(0).getSource());
+ assertNull(bundle4.getResources().get(1).getContent());
+ assertEquals(Uri.parse("//extern/unchanged.dat"),
+ bundle4.getResources().get(1).getSource());
assertEquals(0, bundle4.getResources().get(0).getAttribs().size());
}