svn commit: r744353 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java

[johnh]

Author: johnh
Date: Sat Feb 14 01:41:40 2009
New Revision: 744353

URL: http://svn.apache.org/viewvc?rev=744353&view=rev
Log:
Support URLs with query arguments in the proxy's chained syntax.

HttpServletRequest.getRequestURI() only returns content up to the query string, 
not including it, so
this functionality was not supported before.

Closes Shindig issue SHINDIG-852.


Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java?rev=744353&r1=744352&r2=744353&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java
 Sat Feb 14 01:41:40 2009
@@ -58,7 +58,8 @@
                                 Utf8UrlCoder.decode(paramMatcher.group(2)));
       }
 
-      extractedParameters.put(ProxyBase.URL_PARAM, chainedMatcher.group(2));
+      extractedParameters.put(ProxyBase.URL_PARAM,
+                              Utf8UrlCoder.decode(chainedMatcher.group(2)));
     } else {
       extractedParameters = Collections.emptyMap();
     }

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java?rev=744353&r1=744352&r2=744353&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java
 Sat Feb 14 01:41:40 2009
@@ -67,7 +67,7 @@
 
   public void testChainedSyntaxWithParameters() throws Exception {
     ProxyServletRequest req = setupMockRequest(
-      "http://u:p...@127.0.0.1:80/g/proxy/a=b%20+c&url=u/http://r/p?a=d+e";
+      
"http://u:p...@127.0.0.1:80/g/proxy/a=b%20+c&url=u/http://r/p%3Fa%3Dd%2Be";
     );
     assertTrue(req.isUsingChainedSyntax());
     assertEquals("http://r/p?a=d+e";, req.getParameter("url"));