Updated Branches: refs/heads/master 675b89e42 -> 23018259c
QueryStringUrlCodingStrategy is no longer present since 1.5, thus showing parameter placeholders now in segments Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/23018259 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/23018259 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/23018259 Branch: refs/heads/master Commit: 23018259c840d64bbc22867d2de46869bb4a6a08 Parents: 675b89e Author: svenmeier <[email protected]> Authored: Fri Nov 16 10:06:21 2012 +0100 Committer: svenmeier <[email protected]> Committed: Fri Nov 16 10:06:21 2012 +0100 ---------------------------------------------------------------------- .../org/apache/wicket/examples/niceurl/Home.html | 4 ++-- .../org/apache/wicket/examples/niceurl/Home.java | 2 +- .../examples/niceurl/NiceUrlApplication.java | 2 +- .../wicket/examples/niceurl/NiceUrlTest.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/23018259/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.html index 9fc95df..82af2d9 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.html @@ -20,8 +20,8 @@ Click this BookmarkablePageLink to go to Page 2 </a>  After Page 2 is displayed click refresh link to see url parameters in action <br /> - <a wicket:id="page2LinkQP"> - Same as page 2, but now the url parameters are encoded in a normal fashion + <a wicket:id="page2LinkSegments"> + Same as page 2, but now the url parameters are encoded in the segments </a> <br /> http://git-wip-us.apache.org/repos/asf/wicket/blob/23018259/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java index 8d87d2f..6ff89c9 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java @@ -38,7 +38,7 @@ public class Home extends WicketExamplePage // references to single mounts add(new BookmarkablePageLink<Void>("page1Link", Page1.class)); add(new BookmarkablePageLink<Void>("page2Link", Page2.class)); - add(new BookmarkablePageLink<Void>("page2LinkQP", Page2QP.class)); + add(new BookmarkablePageLink<Void>("page2LinkSegments", Page2QP.class)); // references to package mounts add(new BookmarkablePageLink<Void>("page3Link", Page3.class)); http://git-wip-us.apache.org/repos/asf/wicket/blob/23018259/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java index b82429b..dbda11b 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java @@ -57,7 +57,7 @@ public class NiceUrlApplication extends WicketExampleApplication mountPage("/the/homepage/path", Home.class); mountPage("/a/nice/path/to/the/first/page", Page1.class); mountPage("/path/to/page2", Page2.class); - mountPage("/path/to/page2qpencoded", Page2QP.class); + mountPage("/path/to/page2segments/#{param1}/#{param2}", Page2QP.class); // mount a whole package at once (all bookmarkable pages, // the relative class name will be part of the url http://git-wip-us.apache.org/repos/asf/wicket/blob/23018259/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java index 058dd48..0ada89a 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java @@ -90,7 +90,7 @@ public class NiceUrlTest extends Assert @Test public void testPage2QP() { - tester.clickLink("page2LinkQP"); + tester.clickLink("page2LinkSegments"); tester.assertRenderedPage(Page2QP.class); tester.clickLink("refreshLink"); tester.assertRenderedPage(Page2QP.class);
