Index: jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
===================================================================
--- jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java (revision 532736)
+++ jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java (working copy)
@@ -288,15 +288,13 @@
*/
public String getRelativePath(HttpServletRequest request)
{
- String path = request.getServletPath();
+ String path = request.getRequestURI();
+ String contextPath = request.getContextPath();
+ path = path.substring(contextPath.length());
if (servletMode)
{
- path = request.getPathInfo();
- // No path info => root.
- if (path == null)
- {
- path = "";
- }
+ String servletPath = request.getServletPath();
+ path = path.substring(servletPath.length());
}
filterPath = getFilterPath(request);
Index: jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java
===================================================================
--- jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java (revision 532736)
+++ jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java (working copy)
@@ -33,6 +33,12 @@
}
+ @Override
+ protected void init()
+ {
+ mountBookmarkablePage("/hello", HelloWorld.class);
+ }
+
/**
* @see org.apache.wicket.Application#getHomePage()
*/
Index: jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.java
===================================================================
--- jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.java (revision 532736)
+++ jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.java (working copy)
@@ -16,8 +16,10 @@
*/
package org.apache.wicket.examples.helloworld;
+import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
/**
@@ -30,8 +32,11 @@
/**
* Constructor
*/
- public HelloWorld()
+ public HelloWorld(PageParameters p)
{
- add(new Label("message", "Hello World!"));
+ PageParameters params = new PageParameters();
+ params.add("ext", "Bébé/Baba");
+ add(new Label("message", "Hello World! " + p.getString("ext")));
+ add(new BookmarkablePageLink("link", HelloWorld.class, params));
}
}
\ No newline at end of file
Index: jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.html
===================================================================
--- jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.html (revision 532736)
+++ jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.html (working copy)
@@ -7,5 +7,6 @@
Message goes here
+ Load this page with parameter containing slash and accents