You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2013/10/28 09:17:01 UTC

[45/47] WICKET-4997: fix testcases

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
index 6ae92e0..233f38c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
@@ -1,6 +1,6 @@
 <html xmlns:wicket>
 <body>
-  <form wicket:id="form" id="form1" method="post" action="./page?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+  <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     
   </form>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
index baeac11..9e2678d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
@@ -1,6 +1,6 @@
 <html xmlns:wicket>
 <body>
-  <form wicket:id="form" id="form1" method="post" action="./page?2-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+  <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?2-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     
   </form>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
index 987b223..9258a54 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
@@ -1,6 +1,6 @@
 <html xmlns:wicket>
 <body>
-  <form wicket:id="form" id="form1" method="post" action="./page?4-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+  <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?4-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     
   </form>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
index df38e88..4726ca5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
@@ -1,6 +1,6 @@
 <html xmlns:wicket>
 <body>
-  <form wicket:id="form" id="form1" method="post" action="./page?5-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+  <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?5-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     <wicket:enclosure child="label">
       

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
index 87eb79e..9daf8ec 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
@@ -1,6 +1,6 @@
 <html xmlns:wicket>
 <body>
-  <form wicket:id="form" id="form1" method="post" action="./page?6-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+  <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?6-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     <wicket:enclosure child="label">
       <input wicket:id="input" type="checkbox" name="input"/>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
index 3e86ff0..3cd7389 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
@@ -1,6 +1,6 @@
 <html xmlns:wicket>
 <body>
-  <form wicket:id="form" id="form1" method="post" action="./page?3-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+  <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?3-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     <wicket:enclosure child="label">
       

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
index 2186bd1..f4f2a88 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
@@ -1,6 +1,6 @@
 <html xmlns:wicket>
 <body>
-  <form wicket:id="form" id="form1" method="post" action="./page?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+  <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     <wicket:enclosure child="label">
       <input wicket:id="input" type="checkbox" checked="checked" name="input"/>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html
index 638925b..89e606e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html
@@ -1,6 +1,6 @@
 <html xmlns:wicket>
 <body>
-  <form wicket:id="form" id="form1" method="post" action="./page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+  <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     <wicket:enclosure child="label">
       <input wicket:id="input" type="checkbox" name="input"/>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
index f273606..3b10aeb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
@@ -74,7 +74,8 @@ public class MountedPageLinkTest extends WicketTestCase
 		url = url.replace("part2?0", "part2?3");
 		tester.executeUrl(url);
 
-		// request parameters to callback urls should be ignored for the re-created page (WICKET-4594)
+		// request parameters to callback urls should be ignored for the re-created page
+		// (WICKET-4594)
 		tester.assertContainsNot("param=value");
 	}
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
index e6af20c..6f7fc4c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
@@ -41,6 +41,13 @@ public class PageWithLink extends WebPage
 	}
 
 	@Override
+	public boolean isBookmarkable()
+	{
+		// not bookmarkable because ${param} is required
+		return false;
+	}
+
+	@Override
 	public void renderHead(IHeaderResponse response)
 	{
 		super.renderHead(response);

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
index ff79a37..625af01 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
@@ -3,6 +3,6 @@
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li wicket:id="table"><span wicket:id="txt">six</span></li></ul>
-<a wicket:id="prev" href="../page?1-2.ILinkListener-prev">Prev</a><a wicket:id="nextNext" href="../page?1-2.ILinkListener-nextNext">NextNext</a>
+<a wicket:id="prev" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?1-2.ILinkListener-prev">Prev</a><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?1-2.ILinkListener-nextNext">NextNext</a>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
index 4313e29..d7e9fac 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
@@ -3,6 +3,6 @@
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
-<a wicket:id="prev" href="../page?2-3.ILinkListener-prev">Prev</a><a wicket:id="nextNext" href="../page?2-3.ILinkListener-nextNext">NextNext</a>
+<a wicket:id="prev" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?2-3.ILinkListener-prev">Prev</a><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?2-3.ILinkListener-nextNext">NextNext</a>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
index 2005ebe..d89ceab 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
@@ -3,6 +3,6 @@
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul>
-<span wicket:id="prev"><em>Prev</em></span><a wicket:id="nextNext" href="../page?0-1.ILinkListener-nextNext">NextNext</a>
+<span wicket:id="prev"><em>Prev</em></span><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?0-1.ILinkListener-nextNext">NextNext</a>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
index 6b2d50f..393c63a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
@@ -23,14 +23,14 @@
 	<span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-1.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-1.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
index f14b6f8..d7062c3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
@@ -18,19 +18,19 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-	<a wicket:id="first" class="first" href="../page?0-2.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" class="prev" href="../page?0-2.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
+	<a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
 	</span><span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></span>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-2.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-2.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
index bfdafd6..88e9a07 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
@@ -23,14 +23,14 @@
 	<span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-3.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-3.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
index 5bf540d..f6c87e5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
@@ -18,14 +18,14 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">seven</span></li><li wicket:id="table"><span wicket:id="txt">eight</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-	<a wicket:id="first" class="first" href="../page?0-4.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" class="prev" href="../page?0-4.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
+	<a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
 	</span><span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 4"><em><span wicket:id="pageNumber">4</span></em></span>
 	</span>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
index 7c3ca69..f60bfae 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
@@ -23,14 +23,14 @@
 	<span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-5.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-5.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
index 15e9544..9544cc1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
@@ -18,19 +18,19 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li wicket:id="table"><span wicket:id="txt">six</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-	<a wicket:id="first" class="first" href="../page?0-6.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" class="prev" href="../page?0-6.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
+	<a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
 	</span><span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 3"><em><span wicket:id="pageNumber">3</span></em></span>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-6.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-6.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
index d59bc46..45caf48 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
@@ -18,19 +18,19 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-	<a wicket:id="first" class="first" href="../page?0-7.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" class="prev" href="../page?0-7.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
+	<a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
 	</span><span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></span>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-7.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-7.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
index 7dd02be..15dc522 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
@@ -23,18 +23,18 @@
 	<span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-8.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-8.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-8.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-8.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-8.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-8.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-8.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
index dcc15d8..afbd820 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
@@ -23,20 +23,20 @@
 	<span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-1.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-1.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
index 542d92c..898180c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
@@ -18,25 +18,25 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-	<a wicket:id="first" class="first" href="../page?0-2.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" class="prev" href="../page?0-2.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
+	<a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
 	</span><span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">3-4</span></em></span>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-2.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-2.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
index 8806fbf..1cb8a9d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
@@ -23,20 +23,20 @@
 	<span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-3.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-3.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
index 5026117..0e581ec 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
@@ -18,20 +18,20 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">thirteen</span></li><li wicket:id="table"><span wicket:id="txt">fourteen</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-	<a wicket:id="first" class="first" href="../page?0-4.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" class="prev" href="../page?0-4.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
+	<a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
 	</span><span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 7"><em><span wicket:id="pageNumber">13-14</span></em></span>
 	</span>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
index f726765..7540fa9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
@@ -23,20 +23,20 @@
 	<span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-5.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-5.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
index 7380a8c..b224efa 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
@@ -18,25 +18,25 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">seven</span></li><li wicket:id="table"><span wicket:id="txt">eight</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-	<a wicket:id="first" class="first" href="../page?0-6.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" class="prev" href="../page?0-6.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
+	<a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
 	</span><span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 4"><em><span wicket:id="pageNumber">7-8</span></em></span>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-6.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-6.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
index 075d95b..5ddfe86 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
@@ -18,25 +18,25 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li wicket:id="table"><span wicket:id="txt">six</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-	<a wicket:id="first" class="first" href="../page?0-7.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" class="prev" href="../page?0-7.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
+	<a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
 	</span><span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 3"><em><span wicket:id="pageNumber">5-6</span></em></span>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-7.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-7.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
index 739599c..5ac6fdc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
@@ -23,16 +23,16 @@
 	<span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-1.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-1.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
index 242d716..c30775d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
@@ -18,21 +18,21 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-	<a wicket:id="first" class="first" href="../page?0-2.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" class="prev" href="../page?0-2.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
+	<a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></span>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-2.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-2.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
index efbf626..d978cf6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
@@ -23,16 +23,16 @@
 	<span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
 	</span>
-	<a wicket:id="next" class="next" href="../page?0-3.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
-	<a wicket:id="last" class="last" href="../page?0-3.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2b64c8c5/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
index 49be322..d032d92 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
@@ -18,16 +18,16 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">thirteen</span></li><li wicket:id="table"><span wicket:id="txt">fourteen</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-	<a wicket:id="first" class="first" href="../page?0-4.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" class="prev" href="../page?0-4.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
+	<a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
 		<span wicket:id="pageLink" title="Go to page 7"><em><span wicket:id="pageNumber">7</span></em></span>
 	</span>