svn commit: r1139563 - in /wicket/trunk: wicket-core/src/main/java/org/apache/wicket/util/string/ wicket-core/src/test/java/org/apache/wicket/request/cycle/ wicket-request/src/main/java/org/apache/wicket/request/ wicket-request/src/main/java/org/apache...

[ivaynberg]

Author: ivaynberg
Date: Sat Jun 25 15:49:54 2011
New Revision: 1139563

URL: http://svn.apache.org/viewvc?rev=1139563&view=rev
Log:
better method name

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/string/UrlUtils.java
    
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
    
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
    
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/string/UrlUtils.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/string/UrlUtils.java?rev=1139563&r1=1139562&r2=1139563&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/string/UrlUtils.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/string/UrlUtils.java
 Sat Jun 25 15:49:54 2011
@@ -64,7 +64,7 @@ public class UrlUtils
        {
                if (isRelative(url))
                {
-                       return 
requestCycle.getUrlRenderer().renderContextPathRelativeUrl(url);
+                       return 
requestCycle.getUrlRenderer().renderContextRelativeUrl(url);
                }
                else
                {

Modified: 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java?rev=1139563&r1=1139562&r2=1139563&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
 (original)
+++ 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
 Sat Jun 25 15:49:54 2011
@@ -115,14 +115,14 @@ public class UrlRendererTest extends Tes
                        "/filterPath", "../");
 
                UrlRenderer r = new UrlRenderer(request);
-               assertEquals("../../../../../", 
r.renderContextPathRelativeUrl(""));
-               assertEquals("../../../../../", 
r.renderContextPathRelativeUrl("/"));
-               assertEquals("../../../../../f", 
r.renderContextPathRelativeUrl("/f"));
-               assertEquals("../../../../../../f", 
r.renderContextPathRelativeUrl("../f"));
+               assertEquals("../../../../../", r.renderContextRelativeUrl(""));
+               assertEquals("../../../../../", 
r.renderContextRelativeUrl("/"));
+               assertEquals("../../../../../f", 
r.renderContextRelativeUrl("/f"));
+               assertEquals("../../../../../../f", 
r.renderContextRelativeUrl("../f"));
 
                try
                {
-                       r.renderContextPathRelativeUrl(null);
+                       r.renderContextRelativeUrl(null);
                        fail("Null 'url' is not allowed!");
                }
                catch (IllegalArgumentException iax)

Modified: 
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java?rev=1139563&r1=1139562&r2=1139563&view=diff
==============================================================================
--- 
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
 (original)
+++ 
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
 Sat Jun 25 15:49:54 2011
@@ -269,7 +269,7 @@ public class UrlRenderer
         * @param url
         * @return relative URL
         */
-       public String renderContextPathRelativeUrl(String url)
+       public String renderContextRelativeUrl(String url)
        {
                Args.notNull(url, "url");
 
@@ -289,6 +289,20 @@ public class UrlRenderer
                return buffer.toString();
        }
 
+       /**
+        * Renders the URL within context relative to current base URL.
+        * 
+        * @param url
+        * @return relative URL
+        * @deprecated
+        * @see #renderContextRelativeUrl(String)
+        */
+       @Deprecated
+       public String renderContextPathRelativeUrl(String url)
+       {
+               return renderContextRelativeUrl(url);
+       }
+
        private static String choose(String value, final String fallback1, 
final String fallback2)
        {
                if (Strings.isEmpty(value))

Modified: 
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java?rev=1139563&r1=1139562&r2=1139563&view=diff
==============================================================================
--- 
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java
 (original)
+++ 
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java
 Sat Jun 25 15:49:54 2011
@@ -80,7 +80,7 @@ public class RedirectRequestHandler impl
                if (redirectUrl.startsWith("/"))
                {
                        // context-absolute url
-                       location = 
requestCycle.getUrlRenderer().renderContextPathRelativeUrl(redirectUrl);
+                       location = 
requestCycle.getUrlRenderer().renderContextRelativeUrl(redirectUrl);
                }
                else
                {