Author: johnh
Date: Tue Mar 9 00:24:59 2010
New Revision: 920585
URL: http://svn.apache.org/viewvc?rev=920585&view=rev
Log:
Fix for Gadget context object and expected test results.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java
shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java?rev=920585&r1=920584&r2=920585&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java
Tue Mar 9 00:24:59 2010
@@ -207,25 +207,24 @@
// TODO: Remove these lame hacks by changing Gadget to a proper general
Context object.
public static Gadget makeGadget(final Uri context) {
- final GadgetSpec spec = null;
try {
- new GadgetSpec(context,
+ final GadgetSpec spec = new GadgetSpec(context,
"<Module><ModulePrefs author=\"a\" title=\"t\"></ModulePrefs>" +
"<Content></Content></Module>");
+ return new Gadget() {
+ @Override
+ public GadgetSpec getSpec() {
+ return spec;
+ }
+ }.setContext(new GadgetContext() {
+ @Override
+ public Uri getUrl() {
+ return context;
+ }
+ });
} catch (Exception e) {
throw new RuntimeException("Unexpected boilerplate parse failure");
}
- return new Gadget() {
- @Override
- public GadgetSpec getSpec() {
- return spec;
- }
- }.setContext(new GadgetContext() {
- @Override
- public Uri getUrl() {
- return context;
- }
- });
}
public static Gadget makeGadget(final HttpRequest request) {
Modified:
shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css?rev=920585&r1=920584&r2=920585&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css
(original)
+++
shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css
Tue Mar 9 00:24:59 2010
@@ -1,12 +1,12 @@
/* Rewrite various url forms in input statements, absolute and host/path
relative.
Test exclusions */
-...@import
url('http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fother1.css&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=1150739864&refresh=3600');
-...@import
url('http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fpath%2Frelative%2Fother2.css&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=1150739864&refresh=3600');
+...@import
url('http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fother1.css');
+...@import
url('http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fpath%2Frelative%2Fother2.css');
@import url('http://www.example.org/hostrelative/excluded/other1.css');
DiV {
font: arial;
- background-image :
url('http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.some.site%2Fimage.gif&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=1150739864&refresh=3600');
+ background-image :
url('http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.some.site%2Fimage.gif');
}
/* A comment? */
\ No newline at end of file
