svn commit: r1170345 - in /wicket/trunk/wicket-core/src: main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java main/java/org/apache/wicket/mock/MockWebRequest.java test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java

[ivaynberg]

Author: ivaynberg
Date: Tue Sep 13 21:02:33 2011
New Revision: 1170345

URL: http://svn.apache.org/viewvc?rev=1170345&view=rev
Log:

Issue: WICKET-4030

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
    
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java?rev=1170345&r1=1170344&r2=1170345&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
 Tue Sep 13 21:02:33 2011
@@ -25,7 +25,6 @@ import org.apache.wicket.markup.html.IHe
 import org.apache.wicket.markup.html.WicketEventReference;
 import org.apache.wicket.request.IRequestHandler;
 import org.apache.wicket.request.Response;
-import org.apache.wicket.request.Url;
 import org.apache.wicket.request.cycle.RequestCycle;
 import 
org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -378,22 +377,22 @@ public abstract class HeaderResponse imp
        }
 
        /**
+        * Rewrites a relative url into a context-relative one, leaves absolute 
urls alone
         * 
-        * @param location
+        * @param url
         * @return relative path
         */
-       private String relative(final String location)
+       private String relative(final String url)
        {
-               Args.notEmpty(location, "location");
+               Args.notEmpty(url, "location");
 
-               if (location.startsWith("http://";) || 
location.startsWith("https://";) ||
-                       location.startsWith("/"))
+               if (url.startsWith("http://";) || url.startsWith("https://";) || 
url.startsWith("/"))
                {
-                       return location;
+                       return url;
                }
 
                RequestCycle rc = RequestCycle.get();
-               return rc.getUrlRenderer().renderUrl(Url.parse(location, 
rc.getRequest().getCharset()));
+               return rc.getUrlRenderer().renderContextRelativeUrl(url);
        }
 
        /**

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java?rev=1170345&r1=1170344&r2=1170345&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
 Tue Sep 13 21:02:33 2011
@@ -47,7 +47,7 @@ public class MockWebRequest extends WebR
        private Locale locale = Locale.getDefault();
        private String contextPath;
        private String filterPath;
-       private String prefixToContextPath;
+       private String prefixToContextPath = "";
 
        /**
         * Construct.

Modified: 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java?rev=1170345&r1=1170344&r2=1170345&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java
 (original)
+++ 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java
 Tue Sep 13 21:02:33 2011
@@ -29,7 +29,6 @@ import org.apache.wicket.markup.html.IHe
 import org.apache.wicket.request.IRequestHandler;
 import org.apache.wicket.request.Request;
 import org.apache.wicket.request.Response;
-import org.apache.wicket.request.Url;
 import org.apache.wicket.request.UrlRenderer;
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.resource.IResource;
@@ -86,7 +85,7 @@ public class HeaderResponseTest
                when(requestCycle.getRequest()).thenReturn(request);
 
                UrlRenderer urlRenderer = mock(UrlRenderer.class);
-               
when(urlRenderer.renderUrl(any(Url.class))).thenReturn(RESOURCE_NAME);
+               
when(urlRenderer.renderContextRelativeUrl((any(String.class)))).thenReturn(RESOURCE_NAME);
                when(requestCycle.getUrlRenderer()).thenReturn(urlRenderer);
 
                ThreadContext.setRequestCycle(requestCycle);