svn commit: r990646 - in /shindig/trunk/java: common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizerTest.java

[lindner]

Author: lindner
Date: Sun Aug 29 20:29:35 2010
New Revision: 990646

URL: http://svn.apache.org/viewvc?rev=990646&view=rev
Log:
fix java 1.5 vs 1.6 caused by different iteration order of hashmaps

Modified:
    
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java
    
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizerTest.java

Modified: 
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java?rev=990646&r1=990645&r2=990646&view=diff
==============================================================================
--- 
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java
 (original)
+++ 
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java
 Sun Aug 29 20:29:35 2010
@@ -304,7 +304,7 @@ public final class UriBuilder {
     if (query == null) {
       return Collections.emptyMap();
     }
-    Map<String, List<String>> params = Maps.newHashMap();
+    Map<String, List<String>> params = Maps.newLinkedHashMap();
     Matcher paramMatcher = QUERY_PATTERN.matcher(query);
     while (paramMatcher.find()) {
       String name = Utf8UrlCoder.decode(paramMatcher.group(1));

Modified: 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizerTest.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizerTest.java?rev=990646&r1=990645&r2=990646&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizerTest.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizerTest.java
 Sun Aug 29 20:29:35 2010
@@ -128,8 +128,8 @@ public class CajaCssSanitizerTest extend
     CssTree.StyleSheet styleSheet = parser.parseDom(css);
     sanitizer.sanitize(styleSheet, DUMMY, gadgetContext, importRewriter, 
imageRewriter);
     assertStyleEquals(".xyz { " +
-        "background: 
url('//www.mock.com/dir/proxy?gadget=http%3A%2F%2Fwww.example.org%2Fbase" +
-        
"&container=mockContainer&nocache=0&debug=0&url=http%3A%2F%2Fwww.example.org%2Fimg.gif&"
 +
+        "background: 
url('//www.mock.com/dir/proxy?container=mockContainer&gadget=http%3A%2F%2Fwww.example.org%2Fbase"
 +
+        "&debug=0&nocache=0&url=http%3A%2F%2Fwww.example.org%2Fimg.gif&" +
         "sanitize=1&rewriteMime=image%2F%2a');}", styleSheet);
   }
 
@@ -139,8 +139,8 @@ public class CajaCssSanitizerTest extend
     CssTree.StyleSheet styleSheet = parser.parseDom(css);
     sanitizer.sanitize(styleSheet, DUMMY, gadgetContext, importRewriter, 
imageRewriter);
     assertEquals(".xyz{" +
-        
"background:url('//www.mock.com/dir/proxy?gadget=http%3A%2F%2Fwww.example.org%2Fbase"
 +
-        
"&container=mockContainer&nocache=0&debug=0&url=http%3A%2F%2Fwww.example.org%2Fimg.gif"
 +
+        
"background:url('//www.mock.com/dir/proxy?container=mockContainer&gadget=http%3A%2F%2Fwww.example.org%2Fbase"
 +
+        "&debug=0&nocache=0&url=http%3A%2F%2Fwww.example.org%2Fimg.gif" +
         "&sanitize=1&rewriteMime=image%2F%2a');}",
         parser.serialize(styleSheet).replaceAll("\\s", ""));
   }
@@ -158,8 +158,8 @@ public class CajaCssSanitizerTest extend
 
     sanitizer.sanitize(styleSheet, DUMMY, gadgetContext, importRewriter, 
imageRewriter);
     assertEquals(".xyz{" +
-        
"background:url('//www.test.com/dir/proxy?gadget=http%3A%2F%2Fwww.example.org%2Fbase"
 +
-        
"&container=default&nocache=0&debug=0&url=http%3A%2F%2Fwww.example.org%2Fimg.gif"
 +
+        
"background:url('//www.test.com/dir/proxy?container=default&gadget=http%3A%2F%2Fwww.example.org%2Fbase"
 +
+        "&debug=0&nocache=0&url=http%3A%2F%2Fwww.example.org%2Fimg.gif" +
         "&sanitize=1&rewriteMime=image%2F%2a');}",
         parser.serialize(styleSheet).replaceAll("\\s", ""));
   }