You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2016/03/28 23:31:05 UTC

[1/3] wicket git commit: fixing tests: listener interface no longer in url; stateless components don't need render count in url

Repository: wicket
Updated Branches:
  refs/heads/request_listener_simplification b9ac6df85 -> a6ceb8de1


http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html
index 43d794e..8405f4d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html
@@ -18,21 +18,21 @@
 </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="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?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.PagedTableNavigatorWithMarginPage?0-6.-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-navigation-0-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-6.-navigator-navigation-0-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="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-navigation-1-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-6.-navigator-navigation-1-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
 		<a wicket:id="pageLink" disabled="disabled" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-navigation-3-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-6.-navigator-navigation-3-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="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-navigation-4-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-6.-navigator-navigation-4-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
 	</span>
-	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?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.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-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/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html
index b00cb03..c7c162b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html
@@ -18,21 +18,21 @@
 </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="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?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.PagedTableNavigatorWithMarginPage?0-7.-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?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.PagedTableNavigatorWithMarginPage?0-7.-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="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.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-7.-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" disabled="disabled" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?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.PagedTableNavigatorWithMarginPage?0-7.-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="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.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-7.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
 	</span>
-	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?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.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-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/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html
index 5791acd..d9cd315 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html
@@ -17,6 +17,6 @@
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li></ul>
-<ul><li wicket:id="navigation"><a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTablePage?1-2.ILinkListener-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a></li><li wicket:id="navigation"><a wicket:id="pageLink" disabled="disabled" title="Go to page 2"><span wicket:id="pageNumber">2</span></a></li></ul>
+<ul><li wicket:id="navigation"><a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTablePage?1-2.-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a></li><li wicket:id="navigation"><a wicket:id="pageLink" disabled="disabled" title="Go to page 2"><span wicket:id="pageNumber">2</span></a></li></ul>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
index 58873eb..d3eb182 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.panel.Inl
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_7?0-1.IBehaviorListener.0-provider-ajaxRefresh","c":"ajaxRefresh1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_7?0-1.0-provider-ajaxRefresh","c":"ajaxRefresh1","e":"click"});;
 Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 ;});
 /*]]>*/

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
index 0c259b3..90c3364 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.panel.Inl
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_8?0-1.IBehaviorListener.0-add","c":"add1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_8?0-1.0-add","c":"add1","e":"click"});;
 Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 ;});
 /*]]>*/

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
index 2545175..f384cd4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.tags.InputTagNotVisibleWebPage?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="./org.apache.wicket.markup.html.tags.InputTagNotVisibleWebPage?0-1.-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>
 </body>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
index ff8b622..59dfed5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.tags.InputTagVisibleWebPage?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="./org.apache.wicket.markup.html.tags.InputTagVisibleWebPage?0-1.-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>
 <input wicket:id="input" type="text" value="" name="input">
 </form>
 </body>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult.html
index dc74ce6..c1c220d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult.html
@@ -16,6 +16,6 @@
 <title>Mock Page</title>
 </head>
 <body>
-<a href="?wicket:interface=:0:actionLink::ILinkListener::" wicket:id="actionLink">Action link clicked <span wicket:id="linkClickCount">0</span> times</a>
+<a href="?wicket:interface=:0:actionLink::.::" wicket:id="actionLink">Action link clicked <span wicket:id="linkClickCount">0</span> times</a>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult2.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult2.html
index a8c8df2..ef74779 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult2.html
@@ -16,6 +16,6 @@
 <title>Mock Page</title>
 </head>
 <body>
-<a href="?wicket:interface=:0:actionLink::ILinkListener::" wicket:id="actionLink">Action link clicked <span wicket:id="linkClickCount">1</span> times</a>
+<a href="?wicket:interface=:0:actionLink::.::" wicket:id="actionLink">Action link clicked <span wicket:id="linkClickCount">1</span> times</a>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result.html
index b4d82ff..da788e4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result.html
@@ -4,7 +4,7 @@
     </head>
     <body>
     	first page<br/>
-    	<a href="?wicket:interface=:0:link::ILinkListener::" wicket:id="link">link to second page</a>
+    	<a href="?wicket:interface=:0:link::.::" wicket:id="link">link to second page</a>
     </body>
 </html>
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result2.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result2.html
index cdd5091..ab3ab35 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result2.html
@@ -4,7 +4,7 @@
     </head>
     <body>
     	first page<br/>
-    	<a href="?wicket:interface=:2:link::ILinkListener::" wicket:id="link">link to second page</a>
+    	<a href="?wicket:interface=:2:link::.::" wicket:id="link">link to second page</a>
     </body>
 </html>
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/protocol/http/secondpage_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/secondpage_result.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/secondpage_result.html
index cbadffa..77e54cc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/secondpage_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/secondpage_result.html
@@ -2,6 +2,6 @@
 
 <body>
 	second page<br/>
-	<a href="?wicket:interface=:1:link::ILinkListener::" wicket:id="link">link to first page</a>
+	<a href="?wicket:interface=:1:link::.::" wicket:id="link">link to first page</a>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
index 0a7ce91..431ed3a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
@@ -31,7 +31,7 @@ public class ComponentInfoTest extends Assert
 	@Test
 	public void test1()
 	{
-		String s = "listener-component-path";
+		String s = ".-component-path";
 		ComponentInfo info = ComponentInfo.parse(s);
 		assertEquals("component:path", info.getComponentPath());
 		assertNull(info.getBehaviorId());
@@ -56,7 +56,7 @@ public class ComponentInfoTest extends Assert
 	@Test
 	public void test3()
 	{
-		String s = "listener-";
+		String s = ".-";
 		ComponentInfo info = ComponentInfo.parse(s);
 		// empty component path is allowed - listener invoked on page
 		assertEquals("", info.getComponentPath());
@@ -89,7 +89,7 @@ public class ComponentInfoTest extends Assert
 	@Test
 	public void test6()
 	{
-		String s = "listener-compo~~nent-path";
+		String s = ".-compo~~nent-path";
 		ComponentInfo info = ComponentInfo.parse(s);
 		assertEquals("compo--nent:path", info.getComponentPath());
 		assertNull(info.getBehaviorId());
@@ -103,7 +103,7 @@ public class ComponentInfoTest extends Assert
 	@Test
 	public void test7()
 	{
-		String s = "listener-co~mpo~~nent-path";
+		String s = ".-co~mpo~~nent-path";
 		ComponentInfo info = ComponentInfo.parse(s);
 		assertEquals("co-mpo--nent:path", info.getComponentPath());
 		assertNull(info.getBehaviorId());
@@ -117,7 +117,7 @@ public class ComponentInfoTest extends Assert
 	@Test
 	public void test8()
 	{
-		String s = "listener.12-component-path";
+		String s = ".12-component-path";
 		ComponentInfo info = ComponentInfo.parse(s);
 		assertEquals("component:path", info.getComponentPath());
 		assertEquals((Object)12, info.getBehaviorId());
@@ -131,7 +131,7 @@ public class ComponentInfoTest extends Assert
 	@Test
 	public void test9()
 	{
-		String s = "4.listener-a-b";
+		String s = "4.-a-b";
 		ComponentInfo info = ComponentInfo.parse(s);
 		assertEquals((Integer)4, info.getRenderCount());
 
@@ -144,7 +144,7 @@ public class ComponentInfoTest extends Assert
 	@Test
 	public void test10()
 	{
-		String s = "4.listener.5-a-b";
+		String s = "4.5-a-b";
 		ComponentInfo info = ComponentInfo.parse(s);
 		assertEquals((Integer)4, info.getRenderCount());
 		assertEquals((Integer)5, info.getBehaviorId());
@@ -159,14 +159,13 @@ public class ComponentInfoTest extends Assert
 	public void encodeDecode()
 	{
 		final Integer renderCount = 1;
-		final String listenerInterface = "ILinkListener";
 		final String componentPath = "-nav-container-:-nav:1:link";
 		final Integer behaviorId = null;
 
 		ComponentInfo info = new ComponentInfo(renderCount, componentPath, behaviorId);
 
 		final String encoded = info.toString();
-		assertEquals("1.ILinkListener-~nav~container~-~nav-1-link", encoded);
+		assertEquals("1.-~nav~container~-~nav-1-link", encoded);
 
 		ComponentInfo decoded = ComponentInfo.parse(encoded);
 		assertEquals(renderCount, decoded.getRenderCount());

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
index a1fedc7..83e7ae6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
@@ -1,5 +1,5 @@
 <html>
 <body>
-<a href="./testValue2?-1.ILinkListener-link" wicket:id="link">test</a>
+<a href="./testValue2?-1.-link" wicket:id="link">test</a>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
index 5424ccb..01be322 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
@@ -1,5 +1,5 @@
 <html>
 <body>
-<a href="./stateless?-1.ILinkListener-link&amp;testParam1=testValue1&amp;testParam2=testValue2" wicket:id="link">test</a>
+<a href="./stateless?-.-link&amp;testParam1=testValue1&amp;testParam2=testValue2" wicket:id="link">test</a>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
index c641ea0..63b427ac 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
@@ -1,5 +1,5 @@
 <html>
 <body>
-<a href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?-1.ILinkListener-link&amp;testParam1=testValue1&amp;testParam2=testValue2" wicket:id="link">test</a>
+<a href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?-1.-link&amp;testParam1=testValue1&amp;testParam2=testValue2" wicket:id="link">test</a>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
index 12adc15..ac5f821 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
@@ -1,5 +1,5 @@
 <html>
 <body>
-<a href="./stateless?-1.ILinkListener-link" wicket:id="link">test</a>
+<a href="./stateless?-1.-link" wicket:id="link">test</a>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
index a94ff07..472458f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
@@ -1,5 +1,5 @@
 <html>
 <body>
-<a href="./org.apache.wicket.stateless.StatelessComponentPage?-1.ILinkListener-link" wicket:id="link">test</a>
+<a href="./org.apache.wicket.stateless.StatelessComponentPage?-1.-link" wicket:id="link">test</a>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
index f02f46a..6360d02 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
@@ -1,5 +1,5 @@
 <html>
 <body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.stateless.StatelessPageWithForm?-1.IFormSubmitListener-form&amp;first=foo&amp;second=bar"><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>
+<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.stateless.StatelessPageWithForm?-1.-form&amp;first=foo&amp;second=bar"><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>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html
index 44bda6d..0a0d806 100644
--- a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html
+++ b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html
@@ -105,8 +105,8 @@ Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 </script>
 </head>
 <body>
-<form wicket:id="localeForm" id="localeForm2" method="post" action="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.IFormSubmitListener-localeForm"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="localeForm2_hf_0" id="localeForm2_hf_0" /></div>
-<p><select wicket:id="localeSelect" onchange="document.getElementById(&#039;localeForm2_hf_0&#039;).value=&#039;./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.IOnChangeListener-localeForm-localeSelect&#039;;document.getElementById(&#039;localeForm2&#039;).submit();" name="localeSelect">
+<form wicket:id="localeForm" id="localeForm2" method="post" action="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.-localeForm"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="localeForm2_hf_0" id="localeForm2_hf_0" /></div>
+<p><select wicket:id="localeSelect" onchange="document.getElementById(&#039;localeForm2_hf_0&#039;).value=&#039;./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.-localeForm-localeSelect&#039;;document.getElementById(&#039;localeForm2&#039;).submit();" name="localeSelect">
 <option value="0">cinese (Cina) (Chinese (China))</option>
 <option value="1">cinese (Cina) (Chinese (China))</option>
 <option value="2">cinese (Cina) (Chinese (China))</option>
@@ -127,10 +127,10 @@ Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 <option value="17">italiano (Italia) (Italian (Italy))</option>
 <option value="18">tedesco (German)</option>
 <option value="19">tedesco (Germania) (German (Germany))</option>
-</select> [<a href="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.ILinkListener-localeForm-localeUSLink" wicket:id="localeUSLink">set to english</a>]</p>
+</select> [<a href="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.-localeForm-localeUSLink" wicket:id="localeUSLink">set to english</a>]</p>
 </form>
 <p>
-<form wicket:id="form" id="form3" method="post" action="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form3_hf_0" id="form3_hf_0" /></div><input type="text" wicket:id="dateTextField" value="xx/xx/xx" name="dateTextField" id="dateTextField1"/>
+<form wicket:id="form" id="form3" method="post" action="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form3_hf_0" id="form3_hf_0" /></div><input type="text" wicket:id="dateTextField" value="xx/xx/xx" name="dateTextField" id="dateTextField1"/>
 <span class="yui-skin-sam">&nbsp;<span style="display:none;position:absolute;z-index: 99999;" id="dateTextField1Dp"></span><img style="cursor: pointer; border: none;" id="dateTextField1Icon" src="../resource/org.apache.wicket.extensions.yui.calendar.DatePicker/icon1.gif" alt="" title=""/></span> <input type="submit" value="submit" /></form>
 </p>
 <p>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html
index 128260b..704c4ec 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html
@@ -19,7 +19,7 @@
 This approach allows users to quickly and easily inject any component with bean proxies. Components simply have to annotate any fields they wish injected with @SpringBean annotation.
 Interesting classes:<br/>
 <ul>
-	<li>SpringComponentInjector - an implementation of IComponentInstantiationListener that performs the injection</li>
+	<li>SpringComponentInjector - an implementation of . that performs the injection</li>
 	<li>AnnotPage - contains an annotated field whose value will be initialized with a proxy by the injector</li>
 </ul>
 <table wicket:id="contacts" cellspacing="0" cellpadding="2" class="grid"></table>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html
index 2c7d72d..a1a8875 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html
@@ -26,7 +26,7 @@ This package contains all the classes to make your wicket components and other p
 <p>
 To setup automatic injection of wicket components in your application subclass init() method call:
 <code>
-addComponentInstantiationListener(new SpringComponentInjector(this));
+addComponent.(new SpringComponentInjector(this));
 </code>
 To inject any pojo call <code>InjectorHolder.getInjector().inject(this)</code> in the pojo's constructor.
 </p>


[2/3] wicket git commit: fixing tests: listener interface no longer in url; stateless components don't need render count in url

Posted by sv...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/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 b99055a..f12d478 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">
 		<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.-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.-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/a6ceb8de/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 f1358e0..7e99d6b 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="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?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.-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-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" disabled="disabled" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-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.-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/a6ceb8de/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 76ac974..ce5ecc1 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">
 		<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.-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.-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/a6ceb8de/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 f5e83dd..ef21d53 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="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?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.-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.-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" disabled="disabled" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/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 5586082..f923671 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">
 		<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.-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.-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/a6ceb8de/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 6f710d2..4dd54c4 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="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?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.-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-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" disabled="disabled" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-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.-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/a6ceb8de/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 2496b88..67c5eda 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="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?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.-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-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" disabled="disabled" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-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.-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/a6ceb8de/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 c73cd11..16a0713 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">
 		<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
 	</span><span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-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.-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/a6ceb8de/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 759e34e..ef2d624 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">
 		<a wicket:id="pageLink" disabled="disabled" 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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next"  href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-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.-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/a6ceb8de/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 18bc27f..fe5f497 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="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?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.-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-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" disabled="disabled" 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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next"  href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-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.-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/a6ceb8de/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 54baebd..9b9e17e 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">
 		<a wicket:id="pageLink" disabled="disabled" 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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next"  href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-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.-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/a6ceb8de/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 31c674f..c134259 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="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?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.-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-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" disabled="disabled" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/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 e3cbb22..17eb825 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">
 		<a wicket:id="pageLink" disabled="disabled" 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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next"  href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-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.-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/a6ceb8de/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 fc206db..e34cf49 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="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?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.-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-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" disabled="disabled" 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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next"  href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-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.-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/a6ceb8de/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 bf59680..3002d40 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="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?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.-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-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" disabled="disabled" 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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next"  href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-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.-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/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_8.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_8.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_8.html
index 88bdb0e..bc32e22 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_8.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_8.html
@@ -22,15 +22,15 @@
     <span wicket:id="navigation">
 		  <a wicket:id="pageLink"><span wicket:id="pageNumber">1</span></a>
     </span>, <span wicket:id="navigation">
-		  <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:1:pageLink&amp;interface=ILinkListener" wicket:id="pageLink"><span wicket:id="pageNumber">2</span></a>
+		  <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:1:pageLink&amp;interface=." wicket:id="pageLink"><span wicket:id="pageNumber">2</span></a>
     </span>, <span wicket:id="navigation">
-		  <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:2:pageLink&amp;interface=ILinkListener" wicket:id="pageLink"><span wicket:id="pageNumber">3</span></a>
+		  <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:2:pageLink&amp;interface=." wicket:id="pageLink"><span wicket:id="pageNumber">3</span></a>
     </span>, <span wicket:id="navigation">
-		  <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:3:pageLink&amp;interface=ILinkListener" wicket:id="pageLink"><span wicket:id="pageNumber">4</span></a>
+		  <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:3:pageLink&amp;interface=." wicket:id="pageLink"><span wicket:id="pageNumber">4</span></a>
     </span>, <span wicket:id="navigation">
-		  <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:4:pageLink&amp;interface=ILinkListener" wicket:id="pageLink"><span wicket:id="pageNumber">5</span></a>
+		  <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:4:pageLink&amp;interface=." wicket:id="pageLink"><span wicket:id="pageNumber">5</span></a>
     </span>
-    <a href="/MockWebApplication/MockWebApplication?path=0:navigator:next&amp;interface=ILinkListener" wicket:id="next">&gt;</a>&nbsp;<a href="/MockWebApplication/MockWebApplication?path=0:navigator:last&amp;interface=ILinkListener" wicket:id="last">&gt;&gt;</a>
+    <a href="/MockWebApplication/MockWebApplication?path=0:navigator:next&amp;interface=." wicket:id="next">&gt;</a>&nbsp;<a href="/MockWebApplication/MockWebApplication?path=0:navigator:last&amp;interface=." wicket:id="last">&gt;&gt;</a>
   </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/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 fdb42c2..0aab7be 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">
 		<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.-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.-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/a6ceb8de/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 ea119eb..ef8fc2b 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="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?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.-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-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" disabled="disabled" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-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.-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/a6ceb8de/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 03da8af..be86a2d 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">
 		<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
 	</span>
-	<a wicket:id="next" rel="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>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.-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.-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/a6ceb8de/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 4b819c2..da8b43a 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="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?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.-navigator-first" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.-navigator-prev" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
-		<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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.-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="./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>
+		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.-navigator-navigation-3-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
 		<a wicket:id="pageLink" disabled="disabled" title="Go to page 7"><span wicket:id="pageNumber">7</span></a>
 	</span>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
index 7ea8567..b54a64a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
@@ -23,16 +23,16 @@
 	<span wicket:id="navigation" class="goto">
 		<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
-		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?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.PagedTableNavigatorWithMarginPage?0-5.-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="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?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.PagedTableNavigatorWithMarginPage?0-5.-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="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?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.PagedTableNavigatorWithMarginPage?0-5.-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="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.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-5.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
 	</span>
-	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?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.PagedTableNavigatorWithMarginPage?0-5.ILinkListener-navigator-last" title="Go to last page">&gt;&gt;</a>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>


[3/3] wicket git commit: fixing tests: listener interface no longer in url; stateless components don't need render count in url

Posted by sv...@apache.org.
fixing tests: listener interface no longer in url; stateless components don't need render count in url


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a6ceb8de
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a6ceb8de
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a6ceb8de

Branch: refs/heads/request_listener_simplification
Commit: a6ceb8de16fd36802c49acf2a950af3e2d577afe
Parents: b9ac6df
Author: Sven Meier <sv...@apache.org>
Authored: Mon Mar 28 23:26:04 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Mar 28 23:30:30 2016 +0200

----------------------------------------------------------------------
 .../wicket/DisabledComponentPage1a_result.html  |  2 +-
 .../apache/wicket/TestDetachPageAjaxResult.html |  4 ++--
 .../wicket/TestDetachPageExpectedResult.html    |  2 +-
 .../ajax/AjaxBehaviorEnabled_expected.html      |  2 +-
 .../AjaxHeaderContributionPage2_expected.html   |  4 ++--
 .../AjaxHeaderContributionPage_expected.html    |  4 ++--
 .../ajax/DomReadyOrderPage_ajax_expected.html   |  6 +++---
 .../wicket/ajax/DomReadyOrderPage_expected.html |  4 ++--
 .../form/AjaxFormSubmitTestPage_expected.html   |  4 ++--
 .../OnChangeAjaxBehaviorTestPage_expected.html  |  6 +++---
 .../ajaxLink/AjaxLinkPageExpectedResult.html    |  2 +-
 .../AjaxLinkWithBorderPageExpectedResult.html   |  2 +-
 .../html/ajaxLink/AjaxPage2_ExpectedResult.html |  2 +-
 .../SimpleTestPageExpectedResult-1.html         |  4 ++--
 .../SimpleTestPageExpectedResult.html           |  2 +-
 .../behavior/ImmutableBehaviorIdsTest.java      |  8 ++++----
 .../MarkupInheritanceExpectedResult_12.html     |  2 +-
 .../MarkupInheritanceExpectedResult_4-1.html    |  2 +-
 .../MarkupInheritanceExpectedResult_4.html      |  2 +-
 .../MarkupInheritanceExpectedResult_5.html      |  2 +-
 .../MarkupInheritanceExpectedResult_7.html      |  2 +-
 .../html/basic/SimplePageExpectedResult_13.html |  2 +-
 .../HideableBorderPage_ExpectedResult.html      |  2 +-
 .../CheckGroupDisabledTestPage_expected.html    |  2 +-
 .../html/form/CheckGroupTestPage1_expected.html |  2 +-
 .../html/form/CheckGroupTestPage2_expected.html |  2 +-
 .../html/form/CheckGroupTestPage3_expected.html |  2 +-
 .../html/form/CheckGroupTestPage4_expected.html |  2 +-
 ...DropDownChoiceTestPage_A_false_expected.html |  2 +-
 .../DropDownChoiceTestPage_A_true_expected.html |  2 +-
 ...pDownChoiceTestPage_null_false_expected.html |  2 +-
 ...opDownChoiceTestPage_null_true_expected.html |  2 +-
 .../html/form/FormMethodTestPage_expected.html  |  4 ++--
 .../RadioGroupDisabledTestPage_expected.html    |  2 +-
 .../html/form/RadioGroupTestPage1_expected.html |  2 +-
 .../html/form/RadioGroupTestPage3_expected.html |  2 +-
 .../form/feedback/FeedbackFormPage_result1.html |  2 +-
 .../form/feedback/FeedbackFormPage_result2.html |  2 +-
 .../FeedbackIndicatorFormPage_result1.html      |  2 +-
 .../FeedbackIndicatorFormPage_result2.html      |  2 +-
 .../html/form/pageWithParameters_expected.html  |  4 ++--
 .../validation/HomePage1_ExpectedResult.html    |  2 +-
 .../testing3/TestPage_ExpectedResult-1.html     |  2 +-
 .../testing3/TestPage_ExpectedResult-2.html     |  2 +-
 .../internal/EnclosurePageExpectedResult_3.html |  2 +-
 .../EnclosurePageExpectedResult_9-1-1.html      |  2 +-
 .../EnclosurePageExpectedResult_9-1.html        |  2 +-
 .../EnclosurePageExpectedResult_9-2-1.html      |  2 +-
 .../EnclosurePageExpectedResult_9-2.html        |  2 +-
 .../EnclosurePageExpectedResult_9-3-1.html      |  2 +-
 .../EnclosurePageExpectedResult_9-3-2.html      |  2 +-
 .../EnclosurePageExpectedResult_9-3.html        |  2 +-
 .../EnclosurePageExpectedResult_9-4.html        |  2 +-
 .../internal/EnclosurePageExpectedResult_9.html |  2 +-
 ...lTableNavigationPage_ExpectedResult_1-1.html |  2 +-
 ...lTableNavigationPage_ExpectedResult_1-2.html |  2 +-
 ...talTableNavigationPage_ExpectedResult_1.html |  2 +-
 .../PagedTableNavigatorExpectedResult_1.html    | 10 +++++-----
 .../PagedTableNavigatorExpectedResult_2.html    | 14 +++++++-------
 .../PagedTableNavigatorExpectedResult_3.html    | 10 +++++-----
 .../PagedTableNavigatorExpectedResult_4.html    | 10 +++++-----
 .../PagedTableNavigatorExpectedResult_5.html    | 10 +++++-----
 .../PagedTableNavigatorExpectedResult_6.html    | 14 +++++++-------
 .../PagedTableNavigatorExpectedResult_7.html    | 14 +++++++-------
 .../PagedTableNavigatorExpectedResult_8.html    | 14 +++++++-------
 ...igatorWithLabelProviderExpectedResult_1.html | 16 ++++++++--------
 ...igatorWithLabelProviderExpectedResult_2.html | 20 ++++++++++----------
 ...igatorWithLabelProviderExpectedResult_3.html | 16 ++++++++--------
 ...igatorWithLabelProviderExpectedResult_4.html | 16 ++++++++--------
 ...igatorWithLabelProviderExpectedResult_5.html | 16 ++++++++--------
 ...igatorWithLabelProviderExpectedResult_6.html | 20 ++++++++++----------
 ...igatorWithLabelProviderExpectedResult_7.html | 20 ++++++++++----------
 ...igatorWithLabelProviderExpectedResult_8.html | 10 +++++-----
 ...ableNavigatorWithMarginExpectedResult_1.html | 12 ++++++------
 ...ableNavigatorWithMarginExpectedResult_2.html | 16 ++++++++--------
 ...ableNavigatorWithMarginExpectedResult_3.html | 12 ++++++------
 ...ableNavigatorWithMarginExpectedResult_4.html | 12 ++++++------
 ...ableNavigatorWithMarginExpectedResult_5.html | 12 ++++++------
 ...ableNavigatorWithMarginExpectedResult_6.html | 16 ++++++++--------
 ...ableNavigatorWithMarginExpectedResult_7.html | 16 ++++++++--------
 .../html/list/PagedTablePageExpectedResult.html |  2 +-
 .../panel/InlinePanelPageExpectedResult_7.html  |  2 +-
 .../panel/InlinePanelPageExpectedResult_8.html  |  2 +-
 .../tags/InputTagNotVisibleWebPageResult.html   |  2 +-
 .../html/tags/InputTagVisibleWebPageResult.html |  2 +-
 .../protocol/http/MockPage_expectedResult.html  |  2 +-
 .../protocol/http/MockPage_expectedResult2.html |  2 +-
 .../wicket/protocol/http/firstpage_result.html  |  2 +-
 .../wicket/protocol/http/firstpage_result2.html |  2 +-
 .../wicket/protocol/http/secondpage_result.html |  2 +-
 .../request/mapper/info/ComponentInfoTest.java  | 17 ++++++++---------
 ...nentPageWithParams_indexed_mount_result.html |  2 +-
 ...essComponentPageWithParams_mount_result.html |  2 +-
 ...StatelessComponentPageWithParams_result.html |  2 +-
 .../StatelessComponentPage_mount_result.html    |  2 +-
 .../StatelessComponentPage_result.html          |  2 +-
 .../StatelessPageWithForm_expected.html         |  2 +-
 .../yui/calendar/DatesPage1_ExpectedResult.html |  8 ++++----
 .../examples/spring/annot/web/AnnotPage.html    |  2 +-
 .../wicket/spring/injection/annot/package.html  |  2 +-
 100 files changed, 265 insertions(+), 266 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage1a_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage1a_result.html b/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage1a_result.html
index 787fee4..bcb4461 100644
--- a/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage1a_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage1a_result.html
@@ -1,5 +1,5 @@
 <html xmlns:wicket>
 <body>
-<a href="./org.apache.wicket.DisabledComponentPage1?0-1.ILinkListener-link" wicket:id="link">test</a>
+<a href="./org.apache.wicket.DisabledComponentPage1?0-1.-link" wicket:id="link">test</a>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
index 835bd92..57d737a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
@@ -9,7 +9,7 @@ Wicket.Ajax.DebugWindow.enabled=true;
 </script>
 <script type="text/javascript" id="wicket-ajax-base-url">
 /*<![CDATA[*/
-Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.TestDetachPage?0-1.IBehaviorListener.0-comp";
+Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.TestDetachPage?0-1.0-comp";
 /*]]]]><![CDATA[>*/
 </script>
-</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.TestDetachPage?0-1.IBehaviorListener.0-comp","c":"comp1","e":"click"});})();]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.TestDetachPage?0-1.0-comp","c":"comp1","e":"click"});})();]]></evaluate></ajax-response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
index 47683b2..e374667 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.TestDetachPage?0";
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.TestDetachPage?0-1.IBehaviorListener.0-comp","c":"comp1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.TestDetachPage?0-1.0-comp","c":"comp1","e":"click"});;
 Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 ;});
 /*]]>*/

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html
index db50a9c..fa31fcc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html
@@ -20,7 +20,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxBehaviorEnab
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.AjaxBehaviorEnabledPage?0-1.IBehaviorListener.0-enabled","c":"enabled1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.AjaxBehaviorEnabledPage?0-1.0-enabled","c":"enabled1","e":"click"});;
 Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 ;});
 /*]]>*/

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
index 008e445..fdc95e6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
@@ -24,7 +24,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxHeaderContri
 Wicket.Event.add(window, "domready", function(event) { 
 domReady();;
 domReadyB();;
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.AjaxHeaderContributionPage2?0-1.IBehaviorListener.0-link","c":"link1","e":"click","pd":true});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.AjaxHeaderContributionPage2?0-1.0-link","c":"link1","e":"click","pd":true});;
 Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 ;});
 /*]]>*/
@@ -56,6 +56,6 @@ test
 <span wicket:id="btest3" id="btest37"><wicket:panel>
 test
 </wicket:panel></span>
-<a href="./org.apache.wicket.ajax.AjaxHeaderContributionPage2?0-1.ILinkListener-link" wicket:id="link" id="link1">Test</a>
+<a href="./org.apache.wicket.ajax.AjaxHeaderContributionPage2?0-1.-link" wicket:id="link" id="link1">Test</a>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
index e473bae..ef9e5cd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
@@ -20,7 +20,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxHeaderContri
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 domReady();;
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.AjaxHeaderContributionPage?0-1.IBehaviorListener.0-link","c":"link1","e":"click","pd":true});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.AjaxHeaderContributionPage?0-1.0-link","c":"link1","e":"click","pd":true});;
 Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 ;});
 /*]]>*/
@@ -42,6 +42,6 @@ test
 <span wicket:id="test3" id="test34"><wicket:panel>
 test
 </wicket:panel></span>
-<a href="./org.apache.wicket.ajax.AjaxHeaderContributionPage?0-1.ILinkListener-link" wicket:id="link" id="link1">Test</a>
+<a href="./org.apache.wicket.ajax.AjaxHeaderContributionPage?0-1.-link" wicket:id="link" id="link1">Test</a>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
index 95ba3c2..410a0de 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="test1" ><![CDATA[<a href="./org.apache.wicket.ajax.DomReadyOrderPage?0-1.ILinkListener-test" wicket:id="test" id="test1">Test</a>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-1.12.2.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="test1" ><![CDATA[<a href="./org.apache.wicket.ajax.DomReadyOrderPage?0-1.-test" wicket:id="test" id="test1">Test</a>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-1.12.2.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
@@ -9,7 +9,7 @@ Wicket.Ajax.DebugWindow.enabled=true;
 </script>
 <script type="text/javascript" id="wicket-ajax-base-url">
 /*<![CDATA[*/
-Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.DomReadyOrderPage?0-1.IBehaviorListener.0-test";
+Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.DomReadyOrderPage?0-1.0-test";
 /*]]]]><![CDATA[>*/
 </script>
-</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.DomReadyOrderPage?0-1.IBehaviorListener.0-test","c":"test1","e":"click","pd":true});})();(function(){test1();})();(function(){test2();})();]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.DomReadyOrderPage?0-1.0-test","c":"test1","e":"click","pd":true});})();(function(){test1();})();(function(){test2();})();]]></evaluate></ajax-response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
index e7e0abb..5d49d8f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.DomReadyOrderPag
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.DomReadyOrderPage?0-1.IBehaviorListener.0-test","c":"test1","e":"click","pd":true});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.DomReadyOrderPage?0-1.0-test","c":"test1","e":"click","pd":true});;
 test1();;
 test2();;
 Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
@@ -24,6 +24,6 @@ Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 /*]]>*/
 </script>
 </head><body>
-<a href="./org.apache.wicket.ajax.DomReadyOrderPage?0-1.ILinkListener-test" wicket:id="test" id="test1">Test</a>
+<a href="./org.apache.wicket.ajax.DomReadyOrderPage?0-1.-test" wicket:id="test" id="test1">Test</a>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
index df90dcd..09096e7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
@@ -16,13 +16,13 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.form.AjaxFormSub
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.AjaxFormSubmitTestPage?0-1.IBehaviorListener.0-form-submit","m":"POST","c":"submit2","f":"form1","sc":"p::submit","e":"click","pd":true});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.AjaxFormSubmitTestPage?0-1.0-form-submit","m":"POST","c":"submit2","f":"form1","sc":"p::submit","e":"click","pd":true});;
 Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 ;});
 /*]]>*/
 </script>
 </head><body>
-		<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.ajax.form.AjaxFormSubmitTestPage?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="./org.apache.wicket.ajax.form.AjaxFormSubmitTestPage?0-1.-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>
 			<input type="text" wicket:id="txt1" value="foo" name="txt1"/>
 			<input type="text" wicket:id="txt2" value="bar" name="txt2"/>
 			<input type="submit" value="Submit" wicket:id="submit" name="p::submit" id="submit2"/>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
index 8cd9cd9..754abd8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
@@ -16,14 +16,14 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.form.OnChangeAja
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.IBehaviorListener.0-form-field","m":"POST","c":"field1","e":"inputchange change"});;
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.IBehaviorListener.0-form-dropDown","m":"POST","c":"dropDown2","e":"change"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.0-form-field","m":"POST","c":"field1","e":"inputchange change"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.0-form-dropDown","m":"POST","c":"dropDown2","e":"change"});;
 Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 ;});
 /*]]>*/
 </script>
 </head><body>
-		<form wicket:id="form" id="form3" method="post" action="./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form3_hf_0" id="form3_hf_0" /></div>
+		<form wicket:id="form" id="form3" method="post" action="./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form3_hf_0" id="form3_hf_0" /></div>
 			<input type="text" wicket:id="field" value="" name="field" id="field1"/>
 	
 			<select wicket:id="dropDown" name="dropDown" id="dropDown2">

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
index e3d0324..79bc3ec 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajax
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkPage?0-1.IBehaviorListener.0-ajaxLink","c":"ajaxLink1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkPage?0-1.0-ajaxLink","c":"ajaxLink1","e":"click"});;
 Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 ;});
 /*]]>*/

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
index 53f43d1..ca90e2a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajax
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkWithBorderPage?0-1.IBehaviorListener.0-border-border_body-ajaxLink","c":"ajaxLink1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkWithBorderPage?0-1.0-border-border_body-ajaxLink","c":"ajaxLink1","e":"click"});;
 Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 ;});
 /*]]>*/

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
index a0536cb..27e0579 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajax
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxPage2?0-1.IBehaviorListener.0-pageLayout-pageLayout_body-ajaxLink","c":"ajaxLink1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxPage2?0-1.0-pageLayout-pageLayout_body-ajaxLink","c":"ajaxLink1","e":"click"});;
 Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 ;});
 /*]]>*/

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
index fed32cd..4cb3bde 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
@@ -9,7 +9,7 @@ Wicket.Ajax.DebugWindow.enabled=true;
 </script>
 <script type="text/javascript" id="wicket-ajax-base-url">
 /*<![CDATA[*/
-Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1";
+Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0-1.0-testPanel-baseSpan-linja1";
 /*]]]]><![CDATA[>*/
 </script>
-</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Timer.set('linja11', function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1","c":"linja11"});}, 2000);})();]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Timer.set('linja11', function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0-1.0-testPanel-baseSpan-linja1","c":"linja11"});}, 2000);})();]]></evaluate></ajax-response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
index cba8b64..c5527d1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
@@ -18,7 +18,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.comp
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "load", function(event) { 
-Wicket.Timer.set('linja11', function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1","c":"linja11"});}, 2000);;
+Wicket.Timer.set('linja11', function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0-1.0-testPanel-baseSpan-linja1","c":"linja11"});}, 2000);;
 ;});
 /*]]>*/
 </script>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java b/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java
index bc0aaba..b622e7c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java
@@ -70,8 +70,8 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase
 		assertTrue(output.contains("autocomplete=\"off\""));
 		assertTrue(output.contains("class2=\"border\""));
 		assertTrue(output.contains("autocomplete2=\"off\""));
-		assertTrue(output.contains("IBehaviorListener.0"));
-		assertTrue(output.contains("IBehaviorListener.1"));
+		assertTrue(output.contains(".0"));
+		assertTrue(output.contains(".1"));
 		assertEquals(link, page.getContainer().getBehaviorById(0));
 		assertEquals(link2, page.getContainer().getBehaviorById(1));
 
@@ -86,8 +86,8 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase
 		tester.startPage(page);
 		output = tester.getLastResponseAsString();
 //		System.out.println(output);
-		assertTrue(output.contains("IBehaviorListener.0"));
-		assertTrue(output.contains("IBehaviorListener.1"));
+		assertTrue(output.contains(".0"));
+		assertTrue(output.contains(".1"));
 		assertEquals(link, page.getContainer().getBehaviorById(0));
 		assertEquals(link2, page.getContainer().getBehaviorById(1));
 	}

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_12.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_12.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_12.html
index e370ee8..ba5a54f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_12.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_12.html
@@ -9,6 +9,6 @@
     <wicket:child><wicket:extend>
    888<span wicket:id="label3">extension label</span>999
 </wicket:extend></wicket:child>
-    333<a href="./org.apache.wicket.markup.MarkupInheritanceExtension_12?0-1.ILinkListener-link" wicket:id="link">increment</a>444
+    333<a href="./org.apache.wicket.markup.MarkupInheritanceExtension_12?0-1.-link" wicket:id="link">increment</a>444
   </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4-1.html
index 9eff1ac..88a6069 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4-1.html
@@ -5,5 +5,5 @@
   <!-- note: extension and base can not have equals ids like e.g. "label" -->
   extension: 1 <span wicket:id="label3">extension label</span> extension: 2
 </wicket:extend></wicket:child>
-  extension: 1 <a href="./org.apache.wicket.markup.MarkupInheritanceExtension_4?0-2.ILinkListener-link" wicket:id="link">increment</a> extension: 2
+  extension: 1 <a href="./org.apache.wicket.markup.MarkupInheritanceExtension_4?0-2.-link" wicket:id="link">increment</a> extension: 2
   base: after

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4.html
index b6f7e2a..6e16220 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4.html
@@ -5,5 +5,5 @@
   <!-- note: extension and base can not have equals ids like e.g. "label" -->
   extension: 1 <span wicket:id="label3">extension label</span> extension: 2
 </wicket:extend></wicket:child>
-  extension: 1 <a href="./org.apache.wicket.markup.MarkupInheritanceExtension_4?0-1.ILinkListener-link" wicket:id="link">increment</a> extension: 2
+  extension: 1 <a href="./org.apache.wicket.markup.MarkupInheritanceExtension_4?0-1.-link" wicket:id="link">increment</a> extension: 2
   base: after

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_5.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_5.html
index e20aef9..31d0119 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_5.html
@@ -7,6 +7,6 @@
     <wicket:child><wicket:extend>
    888<span wicket:id="label3">extension label</span>999
 </wicket:extend></wicket:child>
-    333<a href="./org.apache.wicket.markup.MarkupInheritanceExtension_5?0-1.ILinkListener-link" wicket:id="link">increment</a>444
+    333<a href="./org.apache.wicket.markup.MarkupInheritanceExtension_5?0-1.-link" wicket:id="link">increment</a>444
   </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_7.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_7.html
index d59f6d2..5e380d9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_7.html
@@ -9,6 +9,6 @@
     <wicket:child><wicket:extend>
    888<span wicket:id="label3">extension label</span>999
 </wicket:extend></wicket:child>
-    333<a href="./org.apache.wicket.markup.MarkupInheritanceExtension_7?0-1.ILinkListener-link" wicket:id="link">increment</a>444
+    333<a href="./org.apache.wicket.markup.MarkupInheritanceExtension_7?0-1.-link" wicket:id="link">increment</a>444
   </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
index 2dedcd9..eef8858 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
@@ -20,7 +20,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.basic.Sim
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.basic.SimplePage_13?0-1.IBehaviorListener.0-html","c":"html1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.basic.SimplePage_13?0-1.0-html","c":"html1","e":"click"});;
 Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 ;});
 /*]]>*/

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
index cbeb3a1..6d08803 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.border.Hi
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.border.HideableBorderPage?0-1.IBehaviorListener.0-hideable-hideLink","c":"hideLink1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.border.HideableBorderPage?0-1.0-hideable-hideLink","c":"hideLink1","e":"click"});;
 Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 ;});
 /*]]>*/

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
index dfba8d0..4ac8378 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
@@ -2,7 +2,7 @@
 <head><title>CheckGroupTestPage1</title></head>
 <body>
     <!--  In addition test that chars are not converted from upper to lower and vice versa -->
-	<FORM wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupDisabledTestPage?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="./org.apache.wicket.markup.html.form.CheckGroupDisabledTestPage?0-1.-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>
 		<span wicket:id="group">
 			<input type="checkbox" wicket:id="check1" id="check12" name="group" value="check0" checked="checked" disabled="disabled">check1</input>
 			<span wicket:id="container">

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
index 8f23b9b..abd39dc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
@@ -2,7 +2,7 @@
 <head><title>CheckGroupTestPage1</title></head>
 <body>
     <!--  In addition test that chars are not converted from upper to lower and vice versa -->
-	<FORM wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage1?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="./org.apache.wicket.markup.html.form.CheckGroupTestPage1?0-1.-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>
 		
 			<input type="checkbox" wicket:id="check1" id="check12" name="group" value="check0">check1</input>
 			<span wicket:id="container">

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html
index c35c499..1683546 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html
@@ -1,7 +1,7 @@
 <html>
 <head><title>CheckGroupTestPage2</title></head>
 <body>
-	<form wicket:id="form" id="form4" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage2?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form4_hf_0" id="form4_hf_0" /></div>
+	<form wicket:id="form" id="form4" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage2?1-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form4_hf_0" id="form4_hf_0" /></div>
 		
 			<input type="checkbox" wicket:id="check1" id="check15" name="group" value="check0" checked="checked">check1</input>
 			<span wicket:id="container">

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html
index 0af457e..8030cc7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html
@@ -1,7 +1,7 @@
 <html>
 <head><title>CheckGroupTestPage3</title></head>
 <body>
-	<form wicket:id="form" id="form7" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage3?2-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form7_hf_0" id="form7_hf_0" /></div>
+	<form wicket:id="form" id="form7" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage3?2-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form7_hf_0" id="form7_hf_0" /></div>
 		
 			<input type="checkbox" wicket:id="check1" id="check18" name="group" value="check0">check1</input>
 			<span wicket:id="container">

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html
index 9a76d22..5eb87ac 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html
@@ -1,7 +1,7 @@
 <html>
 <head><title>CheckGroupTestPage4</title></head>
 <body>
-	<form wicket:id="form" id="forma" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage4?3-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="forma_hf_0" id="forma_hf_0" /></div>
+	<form wicket:id="form" id="forma" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage4?3-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="forma_hf_0" id="forma_hf_0" /></div>
 		
 			<input type="checkbox" wicket:id="check1" id="check1b" name="group" value="check0" checked="checked">check1</input>
 			<span wicket:id="container">

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html
index 7631045..26965dc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html
@@ -1,6 +1,6 @@
 <html>
 <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="./page?0-1.-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>
     <select wicket:id="dropdown" name="dropdown">
 <option selected="selected" value="0">A</option>
 <option value="1">B</option>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html
index ab08e2d..125c2fe 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html
@@ -1,6 +1,6 @@
 <html>
 <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="./page?0-1.-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>
     <select wicket:id="dropdown" name="dropdown">
 <option value=""></option>
 <option selected="selected" value="0">A</option>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html
index daaf8c4..c1263ea 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html
@@ -1,6 +1,6 @@
 <html>
 <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="./page?0-1.-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>
     <select wicket:id="dropdown" name="dropdown">
 <option selected="selected" value="">Choose One</option>
 <option value="0">A</option>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html
index 7c87409..7dc93d7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html
@@ -1,6 +1,6 @@
 <html>
 <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="./page?0-1.-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>
     <select wicket:id="dropdown" name="dropdown">
 <option selected="selected" value=""></option>
 <option value="0">A</option>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
index 5c824af..6050ab1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-	<form wicket:id="formpost" id="formpost1" method="post" action="./org.apache.wicket.markup.html.form.FormMethodTestPage?0-1.IFormSubmitListener-formpost"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formpost1_hf_0" id="formpost1_hf_0" /></div></form>
-	<form wicket:id="formget" id="formget2" method="get" action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formget2_hf_0" id="formget2_hf_0" /><input type="hidden" name="0-1.IFormSubmitListener-formget" value="" /></div></form>
+	<form wicket:id="formpost" id="formpost1" method="post" action="./org.apache.wicket.markup.html.form.FormMethodTestPage?0-1.-formpost"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formpost1_hf_0" id="formpost1_hf_0" /></div></form>
+	<form wicket:id="formget" id="formget2" method="get" action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formget2_hf_0" id="formget2_hf_0" /><input type="hidden" name="0-1.-formget" value="" /></div></form>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
index ad4f11a..3f468c0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
@@ -1,7 +1,7 @@
 <html>
 <head><title>RadioGroupTestPage1</title></head>
 <body>
-	<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.RadioGroupDisabledTestPage?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="./org.apache.wicket.markup.html.form.RadioGroupDisabledTestPage?0-1.-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>
 		<span wicket:id="group">
 			<input type="radio" wicket:id="radio1" id="radio12" name="group" value="radio0" disabled="disabled">radio1</input>
 			<span wicket:id="container">

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html
index 5d518b7..09dee23 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html
@@ -1,7 +1,7 @@
 <html>
 <head><title>RadioGroupTestPage1</title></head>
 <body>
-	<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.RadioGroupTestPage1?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="./org.apache.wicket.markup.html.form.RadioGroupTestPage1?0-1.-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>
 		
 			<input type="radio" wicket:id="radio1" id="radio12" name="group" value="radio0">radio1</input>
 			<span wicket:id="container">

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html
index 30d2934..4a6a0b6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.RadioGroupTestPage3?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="./org.apache.wicket.markup.html.form.RadioGroupTestPage3?0-1.-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>
 	
 		<input wicket:id="check1" type="radio" id="check12" name="radio" value="radio0" checked="checked">Yes
 		<input wicket:id="check2" type="radio" id="check23" name="radio" value="radio1" checked="checked">No

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html
index b349a8e..1beb7a5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackFormPage?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="./org.apache.wicket.markup.html.form.feedback.FeedbackFormPage?0-1.-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>
 <span wicket:id="feedback"><wicket:border>
 		<wicket:body>
 	<input type="text" wicket:id="input" value="" name="feedback:feedback_body:input">

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html
index da7d6b2..c1f54fc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackFormPage?1-2.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="./org.apache.wicket.markup.html.form.feedback.FeedbackFormPage?1-2.-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>
 <span wicket:id="feedback"><wicket:border>
 		<wicket:body>
 	<input type="text" wicket:id="input" value="" name="feedback:feedback_body:input">

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html
index dd0d17b..3fe836e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackIndicatorFormPage?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="./org.apache.wicket.markup.html.form.feedback.FeedbackIndicatorFormPage?0-1.-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>
 	<input type="text" wicket:id="input" value="" name="input">
 
 </form>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html
index fd9e1fa..e1fe256 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackIndicatorFormPage?1-2.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="./org.apache.wicket.markup.html.form.feedback.FeedbackIndicatorFormPage?1-2.-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>
 	<input type="text" wicket:id="input" value="" name="input">
 <span wicket:id="feedback"><wicket:panel><span style="color:red;">*</span></wicket:panel></span>
 </form>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
index 726c41a..665c8b4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-	<form wicket:id="formpost" id="formpost1" method="post" action="./org.apache.wicket.markup.html.form.FormMethodTestPage?0-1.IFormSubmitListener-formpost&amp;first=foo&amp;second=bar"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formpost1_hf_0" id="formpost1_hf_0" /></div></form>
-	<form wicket:id="formget" id="formget2" method="get" action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formget2_hf_0" id="formget2_hf_0" /><input type="hidden" name="0-1.IFormSubmitListener-formget" value="" /><input type="hidden" name="first" value="foo" /><input type="hidden" name="second" value="bar" /></div></form>
+	<form wicket:id="formpost" id="formpost1" method="post" action="./org.apache.wicket.markup.html.form.FormMethodTestPage?0-1.-formpost&amp;first=foo&amp;second=bar"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formpost1_hf_0" id="formpost1_hf_0" /></div></form>
+	<form wicket:id="formget" id="formget2" method="get" action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formget2_hf_0" id="formget2_hf_0" /><input type="hidden" name="0-1.-formget" value="" /><input type="hidden" name="first" value="foo" /><input type="hidden" name="second" value="bar" /></div></form>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html
index 3b8ec37..561b878 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html
@@ -8,7 +8,7 @@
         <span wicket:id="message">If you see this message wicket is properly configured and running</span>
         
         <div wicket:id="bug"><wicket:panel>
-	<form wicket:id="form" id="form8" method="post" action="./org.apache.wicket.markup.html.form.validation.HomePage1?1-1.IFormSubmitListener-bug-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form8_hf_0" id="form8_hf_0" /></div>
+	<form wicket:id="form" id="form8" method="post" action="./org.apache.wicket.markup.html.form.validation.HomePage1?1-1.-bug-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form8_hf_0" id="form8_hf_0" /></div>
 	  <div wicket:id="border"><wicket:border>
 		<wicket:body>
 	    <input wicket:id="name" value="" name="border:border_body:name"/>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-1.html
index 5ba92fb..0540f9d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-1.html
@@ -7,6 +7,6 @@
   <span wicket:id="panel"><wicket:panel>
     Panel 1
   </wicket:panel></span>
-  <a wicket:id="link" href="./org.apache.wicket.markup.html.header.testing3.TestPage?0-1.ILinkListener-link">Replace the panel</a>
+  <a wicket:id="link" href="./org.apache.wicket.markup.html.header.testing3.TestPage?0-1.-link">Replace the panel</a>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html
index b0b2a08..6a1f8a3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html
@@ -7,6 +7,6 @@
   <span wicket:id="panel"><wicket:panel>
   Panel 2
 </wicket:panel></span>
-  <a wicket:id="link" href="./org.apache.wicket.markup.html.header.testing3.TestPage?1-2.ILinkListener-link">Replace the panel</a>
+  <a wicket:id="link" href="./org.apache.wicket.markup.html.header.testing3.TestPage?1-2.-link">Replace the panel</a>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_3.html
index dc10071..bd8e800 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_3.html
@@ -4,7 +4,7 @@
   before <wicket:body>
     <wicket:enclosure child="newLink">
       <div class="action">
-        <a wicket:id="newLink" href="./org.apache.wicket.markup.html.internal.EnclosurePage_3?0-1.ILinkListener-border-border_body-newLink">test</a>
+        <a wicket:id="newLink" href="./org.apache.wicket.markup.html.internal.EnclosurePage_3?0-1.-border-border_body-newLink">test</a>
       </div>
     </wicket:enclosure>
   </wicket:body> after

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html
index 21c441d..ec477f4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-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="./page?2-1.-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/a6ceb8de/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..96a4816 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="./page?1-1.-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/a6ceb8de/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..36e99d4 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="./page?2-1.-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/a6ceb8de/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..ab64beb 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="./page?4-1.-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/a6ceb8de/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..78db5e1 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="./page?5-1.-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/a6ceb8de/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..a662144 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="./page?6-1.-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/a6ceb8de/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..3776723 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="./page?3-1.-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/a6ceb8de/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..c2642aa 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="./page?1-1.-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/a6ceb8de/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..bf42d8d 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="./page?0-1.-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/a6ceb8de/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 625af01..41bbbe0 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="./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>
+<a wicket:id="prev" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?1-2.-prev">Prev</a><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?1-2.-nextNext">NextNext</a>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/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 d7e9fac..87dd203 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="./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>
+<a wicket:id="prev" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?2-3.-prev">Prev</a><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?2-3.-nextNext">NextNext</a>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/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 236b19b..7919591 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>
-<a wicket:id="prev" disabled="disabled">Prev</a><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?0-1.ILinkListener-nextNext">NextNext</a>
+<a wicket:id="prev" disabled="disabled">Prev</a><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?0-1.-nextNext">NextNext</a>
 </body>
 </html>