You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2013/10/28 10:22:38 UTC
[4/5] git commit: WICKET-4997: fix testcases
WICKET-4997: fix testcases
Conflicts:
wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_11.html
wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html
wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9c277293
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9c277293
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9c277293
Branch: refs/heads/master
Commit: 9c277293dfc4321bf495fa58db01c51dfc302e87
Parents: bf43914
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Mon Aug 19 11:09:20 2013 +0200
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Mon Oct 28 10:21:57 2013 +0100
----------------------------------------------------------------------
.../wicket/DisabledComponentPage1a_result.html | 2 +-
.../apache/wicket/TestDetachPageAjaxResult.html | 12 ++--
.../wicket/TestDetachPageExpectedResult.html | 2 +-
.../ajax/AjaxBehaviorEnabled_expected.html | 2 +-
.../wicket/ajax/AjaxCallbackFunctionTest.java | 14 ++--
...axHeaderContributionPage2_ajax_expected.html | 12 ++--
.../AjaxHeaderContributionPage2_expected.html | 4 +-
...jaxHeaderContributionPage_ajax_expected.html | 8 +--
.../AjaxHeaderContributionPage_expected.html | 4 +-
.../ajax/DomReadyOrderPage_ajax_expected.html | 12 ++--
.../wicket/ajax/DomReadyOrderPage_expected.html | 4 +-
.../wicket/ajax/MockComponent3-expected.html | 2 +-
.../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 | 12 ++--
.../SimpleTestPageExpectedResult.html | 2 +-
.../request/mapper/BookmarkableMapperTest.java | 69 ++++++++++++--------
.../core/request/mapper/PackageMapperTest.java | 16 +++--
.../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 +-
.../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 +-
.../markup/html/link/MountedPageLinkTest.java | 3 +-
.../wicket/markup/html/link/PageWithLink.java | 7 ++
...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 +++---
...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 +-
.../wicket/protocol/http/TestExpirePage.java | 5 ++
.../yui/calendar/DatesPage1_ExpectedResult.html | 8 +--
89 files changed, 326 insertions(+), 294 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 b27046d..787fee4 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="../page?0-1.ILinkListener-link" wicket:id="link">test</a>
+<a href="./org.apache.wicket.DisabledComponentPage1?0-1.ILinkListener-link" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 8097ee5..bdfdb9b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="comp1" ><![CDATA[<span wicket:id="comp" id="comp1">body</span>]]></component><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="./resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-1.10.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>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="comp1" ><![CDATA[<span wicket:id="comp" id="comp1">body</span>]]></component><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-1.10.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>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
@@ -9,7 +9,7 @@ Wicket.Ajax.DebugWindow.enabled=true;
</script>
<script type="text/javascript" id="wicket-ajax-base-url">
/*<![CDATA[*/
-Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.0-comp";
+Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.TestDetachPage?0-1.IBehaviorListener.0-comp";
/*]^]^>*/
</script>
-</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"u":"./page?0-1.IBehaviorListener.0-comp","e":"click","c":"comp1"});})();]]></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.IBehaviorListener.0-comp","e":"click","c":"comp1"});})();]]></evaluate></ajax-response>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 769d6cc..0e40e1e 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":"../page?0-1.IBehaviorListener.0-comp","e":"click","c":"comp1"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.TestDetachPage?0-1.IBehaviorListener.0-comp","e":"click","c":"comp1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 3175d37..f0bc1a4 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":"../page?0-1.IBehaviorListener.0-enabled","e":"click","c":"enabled1"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.AjaxBehaviorEnabledPage?0-1.IBehaviorListener.0-enabled","e":"click","c":"enabled1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java
index 2487c9e..430821b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java
@@ -33,7 +33,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class);
assertEquals(//
"function () {\n" //
- + "var attrs = {\"u\":\"./wicket/page?0-1.IBehaviorListener.0-\"};\n" //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" //
+ "var params = {};\n" //
+ "attrs.ep = params;\n" //
+ "Wicket.Ajax.ajax(attrs);\n" //
@@ -47,7 +47,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class);
assertEquals(//
"function (context) {\n" //
- + "var attrs = {\"u\":\"./wicket/page?0-1.IBehaviorListener.0-\"};\n" //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" //
+ "var params = {};\n" //
+ "attrs.ep = params;\n" //
+ "Wicket.Ajax.ajax(attrs);\n" //
@@ -61,7 +61,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class);
assertEquals(//
"function (explicit) {\n" //
- + "var attrs = {\"u\":\"./wicket/page?0-1.IBehaviorListener.0-\"};\n" //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" //
+ "var params = {'explicit': explicit};\n" //
+ "attrs.ep = params;\n" //
+ "Wicket.Ajax.ajax(attrs);\n" //
@@ -75,7 +75,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class);
assertEquals(//
"function () {\n" //
- + "var attrs = {\"u\":\"./wicket/page?0-1.IBehaviorListener.0-\"};\n" //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" //
+ "var params = {'resolved': window.location.href};\n" //
+ "attrs.ep = params;\n" //
+ "Wicket.Ajax.ajax(attrs);\n" //
@@ -92,7 +92,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
assertEquals(
//
"function (converted) {\n" //
- + "var attrs = {\"u\":\"./wicket/page?0-1.IBehaviorListener.0-\"};\n" //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" //
+ "var params = {'converted': converted.substring(0, 3)};\n" //
+ "attrs.ep = params;\n" //
+ "Wicket.Ajax.ajax(attrs);\n" //
@@ -109,7 +109,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
assertEquals(
//
"function (context,explicit,converted) {\n" //
- + "var attrs = {\"u\":\"./wicket/page?0-1.IBehaviorListener.0-\"};\n" //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" //
+ "var params = {'explicit': explicit,'resolved': window.location.href,'converted': converted.substring(0, 3)};\n" //
+ "attrs.ep = params;\n" //
+ "Wicket.Ajax.ajax(attrs);\n" //
@@ -128,7 +128,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
assertEquals(
//
"function (event,ui) {\n" //
- + "var attrs = {\"u\":\"./wicket/page?0-1.IBehaviorListener.0-\"};\n" //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" //
+ "var params = {'sortIndex': $(this).find(':data(sortable-item)').index(ui.item),'sortItemId': $(ui.item).attr('id'),'sortSenderId': $(ui.sender).attr('id')};\n" //
+ "attrs.ep = params;\n" //
+ "Wicket.Ajax.ajax(attrs);\n" //
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
index 1a47f63..5219dc8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
@@ -11,11 +11,11 @@ test
</wicket:panel></span>]]></component><component id="btest37" ><![CDATA[<span wicket:id="btest3" id="btest37"><wicket:panel>
test
</wicket:panel></span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org">
-<link href="../test"/>
-<script type="text/javascript" src="../javascripturl"></script>
-<script type="text/javascript" src="./resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-1.10.2.js"></script>
-<script type="text/javascript" src="./resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<link href="../../test"/>
+<script type="text/javascript" src="../../javascripturl"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-1.10.2.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
-<link href="../test2"/>
-<script type="text/javascript" src="../javascripturlB"></script>
+<link href="../../test2"/>
+<script type="text/javascript" src="../../javascripturlB"></script>
</head>]]></header-contribution><priority-evaluate><![CDATA[(function(){prepend();})();]]></priority-evaluate><evaluate><![CDATA[(function(){domReady();})();(function(){domReadyB();})();(function(){append();})();(function(){onLoad();})();(function(){onLoadB();})();]]></evaluate></ajax-response>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 9601b88..5d90e56 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({"pd":true,"u":"../page?0-1.IBehaviorListener.0-link","e":"click","c":"link1"});;
+Wicket.Ajax.ajax({"pd":true,"u":"./org.apache.wicket.ajax.AjaxHeaderContributionPage2?0-1.IBehaviorListener.0-link","e":"click","c":"link1"});;
;});
/*]]>*/
</script>
@@ -55,6 +55,6 @@ test
<span wicket:id="btest3" id="btest37"><wicket:panel>
test
</wicket:panel></span>
-<a href="../page?0-1.ILinkListener-link" wicket:id="link" id="link1">Test</a>
+<a href="./org.apache.wicket.ajax.AjaxHeaderContributionPage2?0-1.ILinkListener-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/9c277293/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
index 7eb466f..6686218 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
@@ -5,8 +5,8 @@ test
</wicket:panel></span>]]></component><component id="test34" ><![CDATA[<span wicket:id="test3" id="test34"><wicket:panel>
test
</wicket:panel></span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org">
-<link href="../test"/>
-<script type="text/javascript" src="../javascripturl"></script>
-<script type="text/javascript" src="./resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-1.10.2.js"></script>
-<script type="text/javascript" src="./resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<link href="../../test"/>
+<script type="text/javascript" src="../../javascripturl"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-1.10.2.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
</head>]]></header-contribution><priority-evaluate><![CDATA[(function(){prepend();})();]]></priority-evaluate><evaluate><![CDATA[(function(){domReady();})();(function(){append();})();(function(){onLoad();})();]]></evaluate></ajax-response>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 63adbc3..335d970 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({"pd":true,"u":"../page?0-1.IBehaviorListener.0-link","e":"click","c":"link1"});;
+Wicket.Ajax.ajax({"pd":true,"u":"./org.apache.wicket.ajax.AjaxHeaderContributionPage?0-1.IBehaviorListener.0-link","e":"click","c":"link1"});;
;});
/*]]>*/
</script>
@@ -41,6 +41,6 @@ test
<span wicket:id="test3" id="test34"><wicket:panel>
test
</wicket:panel></span>
-<a href="../page?0-1.ILinkListener-link" wicket:id="link" id="link1">Test</a>
+<a href="./org.apache.wicket.ajax.AjaxHeaderContributionPage?0-1.ILinkListener-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/9c277293/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 d75fefa..4b56fd0 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,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="test1" ><![CDATA[<a href="./page?0-1.ILinkListener-test" wicket:id="test" id="test1">Test</a>]]></component><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="./resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-1.10.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>
+<?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 encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-1.10.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>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
@@ -9,7 +9,7 @@ Wicket.Ajax.DebugWindow.enabled=true;
</script>
<script type="text/javascript" id="wicket-ajax-base-url">
/*<![CDATA[*/
-Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.0-test";
+Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.DomReadyOrderPage?0-1.IBehaviorListener.0-test";
/*]^]^>*/
</script>
-</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"pd":true,"u":"./page?0-1.IBehaviorListener.0-test","e":"click","c":"test1"});})();(function(){test1();})();(function(){test2();})();]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"pd":true,"u":"./org.apache.wicket.ajax.DomReadyOrderPage?0-1.IBehaviorListener.0-test","e":"click","c":"test1"});})();(function(){test1();})();(function(){test2();})();]]></evaluate></ajax-response>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 6ab4396..a24fc66 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,13 +16,13 @@ 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({"pd":true,"u":"../page?0-1.IBehaviorListener.0-test","e":"click","c":"test1"});;
+Wicket.Ajax.ajax({"pd":true,"u":"./org.apache.wicket.ajax.DomReadyOrderPage?0-1.IBehaviorListener.0-test","e":"click","c":"test1"});;
test1();;
test2();;
;});
/*]]>*/
</script>
</head><body>
-<a href="../page?0-1.ILinkListener-test" wicket:id="test" id="test1">Test</a>
+<a href="./org.apache.wicket.ajax.DomReadyOrderPage?0-1.ILinkListener-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/9c277293/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html
index 7171a53..f9552b4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html
@@ -1,2 +1,2 @@
-<![CDATA[<head xmlns:wicket="http://wicket.apache.org"><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.ajax.MockComponent3/mockStyleSheet3.css" />
+<![CDATA[<head xmlns:wicket="http://wicket.apache.org"><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.ajax.MockComponent3/mockStyleSheet3.css" />
</head>]]>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 3d217a3..6f5f6c8 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,12 +16,12 @@ 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({"pd":true,"f":"form1","u":"../page?0-1.IBehaviorListener.0-form-submit","e":"click","c":"submit2","sc":":submit","m":"POST"});;
+Wicket.Ajax.ajax({"pd":true,"f":"form1","u":"./org.apache.wicket.ajax.form.AjaxFormSubmitTestPage?0-1.IBehaviorListener.0-form-submit","e":"click","c":"submit2","sc":":submit","m":"POST"});;
;});
/*]]>*/
</script>
</head><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="./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>
<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=":submit" id="submit2"/>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 d4e98e0..7fbdafa 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,13 +16,13 @@ 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":"../page?0-1.IBehaviorListener.0-form-field","e":"inputchange change","c":"field1","m":"POST"});;
-Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.0-form-dropDown","e":"inputchange change","c":"dropDown2","m":"POST"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.IBehaviorListener.0-form-field","e":"inputchange change","c":"field1","m":"POST"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.IBehaviorListener.0-form-dropDown","e":"inputchange change","c":"dropDown2","m":"POST"});;
;});
/*]]>*/
</script>
</head><body>
- <form wicket:id="form" id="form3" 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="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.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="field" value="" name="field" id="field1"/>
<select wicket:id="dropDown" name="dropDown" id="dropDown2">
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 59a63d4..47e1f15 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":"../page?0-1.IBehaviorListener.0-ajaxLink","e":"click","c":"ajaxLink1"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkPage?0-1.IBehaviorListener.0-ajaxLink","e":"click","c":"ajaxLink1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 10fc466..11cdd74 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":"../page?0-1.IBehaviorListener.0-border-border_body-ajaxLink","e":"click","c":"ajaxLink1"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkWithBorderPage?0-1.IBehaviorListener.0-border-border_body-ajaxLink","e":"click","c":"ajaxLink1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 305359c..0247136 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":"../page?0-1.IBehaviorListener.0-pageLayout-pageLayout_body-ajaxLink","e":"click","c":"ajaxLink1"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxPage2?0-1.IBehaviorListener.0-pageLayout-pageLayout_body-ajaxLink","e":"click","c":"ajaxLink1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 beb46df..9e8b391 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
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="linja11" ><![CDATA[<span wicket:id="linja1" id="linja11">1</span>]]></component><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="./resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-1.10.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>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="linja11" ><![CDATA[<span wicket:id="linja1" id="linja11">1</span>]]></component><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-1.10.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>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
@@ -9,7 +9,7 @@ Wicket.Ajax.DebugWindow.enabled=true;
</script>
<script type="text/javascript" id="wicket-ajax-base-url">
/*<![CDATA[*/
-Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1";
+Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1";
/*]^]^>*/
</script>
<script type="text/javascript" id="AbstractAjaxTimerBehavior-timers">
@@ -17,4 +17,4 @@ Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.0-testPanel-baseSpan-linj
if (typeof(Wicket.TimerHandles) === 'undefined') {Wicket.TimerHandles = {}}
/*]^]^>*/
</script>
-</head>]]></header-contribution><evaluate encoding="wicket1"><![CDATA[(function(){Wicket.TimerHandles['linja11']^ = setTimeout('Wicket.Ajax.ajax({\"u\":\"./page?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1\",\"c\":\"linja11\"});', 2000)})();]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><evaluate encoding="wicket1"><![CDATA[(function(){Wicket.TimerHandles['linja11']^ = setTimeout('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
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 d0413db..16f6f80 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
@@ -23,7 +23,7 @@ if (typeof(Wicket.TimerHandles) === 'undefined') {Wicket.TimerHandles = {}}
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "load", function(event) {
-Wicket.TimerHandles['linja11'] = setTimeout('Wicket.Ajax.ajax({\"u\":\"../page?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1\",\"c\":\"linja11\"});', 2000);
+Wicket.TimerHandles['linja11'] = setTimeout('Wicket.Ajax.ajax({\"u\":\"./org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1\",\"c\":\"linja11\"});', 2000);
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
index 4b71b65..07850a3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
@@ -50,6 +50,12 @@ public class BookmarkableMapperTest extends AbstractMapperTest
{
return context;
}
+
+ @Override
+ boolean getRecreateMountedPagesAfterExpiry()
+ {
+ return true;
+ }
};
private static final String PAGE_CLASS_NAME = MockPage.class.getName();
@@ -243,10 +249,12 @@ public class BookmarkableMapperTest extends AbstractMapperTest
/**
* WICKET-5071
- *
- * Decodes a request to {@link org.apache.wicket.core.request.mapper.IMapperContext#getBookmarkableIdentifier()}/com.example.MyPage
- * when the current base url is
- * {@link org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}/{@link org.apache.wicket.core.request.mapper.IMapperContext#getBookmarkableIdentifier()}
+ *
+ * Decodes a request to
+ * {@link org.apache.wicket.core.request.mapper.IMapperContext#getBookmarkableIdentifier()}
+ * /com.example.MyPage when the current base url is
+ * {@link org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}/
+ * {@link org.apache.wicket.core.request.mapper.IMapperContext#getBookmarkableIdentifier()}
*/
@Test
public void decode11()
@@ -278,10 +286,10 @@ public class BookmarkableMapperTest extends AbstractMapperTest
{
StringBuilder url = new StringBuilder();
url.append(context.getNamespace())
- .append('/')
- .append(context.getBookmarkableIdentifier())
- .append('/')
- .append("com.example.MyPage");
+ .append('/')
+ .append(context.getBookmarkableIdentifier())
+ .append('/')
+ .append("com.example.MyPage");
return Url.parse(url.toString());
}
@@ -293,18 +301,21 @@ public class BookmarkableMapperTest extends AbstractMapperTest
};
IRequestHandler handler = encoder.mapRequest(request);
- assertNotNull("A handler should be resolved for relative url to a bookmarkable page!", handler);
+ assertNotNull("A handler should be resolved for relative url to a bookmarkable page!",
+ handler);
- IRequestablePage page = ((IPageRequestHandler) handler).getPage();
+ IRequestablePage page = ((IPageRequestHandler)handler).getPage();
assertEquals(page.getClass().getName(), PAGE_CLASS_NAME);
}
/**
* WICKET-5071
- *
- * Decodes a request to {@link org.apache.wicket.core.request.mapper.IMapperContext#getBookmarkableIdentifier()}/com.example.MyPage
- * when the current base url is
- * {@link org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}/{@link org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
+ *
+ * Decodes a request to
+ * {@link org.apache.wicket.core.request.mapper.IMapperContext#getBookmarkableIdentifier()}
+ * /com.example.MyPage when the current base url is
+ * {@link org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}/
+ * {@link org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
*/
@Test
public void decode12()
@@ -336,9 +347,9 @@ public class BookmarkableMapperTest extends AbstractMapperTest
{
StringBuilder url = new StringBuilder();
url.append(context.getNamespace())
- .append('/')
- .append(context.getPageIdentifier())
- .append("?3");
+ .append('/')
+ .append(context.getPageIdentifier())
+ .append("?3");
return Url.parse(url.toString());
}
@@ -350,18 +361,21 @@ public class BookmarkableMapperTest extends AbstractMapperTest
};
IRequestHandler handler = encoder.mapRequest(request);
- assertNotNull("A handler should be resolved for relative url to a page instance url!", handler);
+ assertNotNull("A handler should be resolved for relative url to a page instance url!",
+ handler);
- IRequestablePage page = ((IPageRequestHandler) handler).getPage();
+ IRequestablePage page = ((IPageRequestHandler)handler).getPage();
assertEquals(page.getClass().getName(), PAGE_CLASS_NAME);
}
/**
* WICKET-5071
- *
- * Decodes a request to {@link org.apache.wicket.core.request.mapper.IMapperContext#getBookmarkableIdentifier()}/com.example.MyPage
- * when the current base url is
- * {@link org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}/{@link org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
+ *
+ * Decodes a request to
+ * {@link org.apache.wicket.core.request.mapper.IMapperContext#getBookmarkableIdentifier()}
+ * /com.example.MyPage when the current base url is
+ * {@link org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}/
+ * {@link org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
*/
@Test
public void decode13()
@@ -392,9 +406,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
public Url getClientUrl()
{
StringBuilder url = new StringBuilder();
- url.append(context.getBookmarkableIdentifier())
- .append('/')
- .append(PAGE_CLASS_NAME);
+ url.append(context.getBookmarkableIdentifier()).append('/').append(PAGE_CLASS_NAME);
return Url.parse(url.toString());
}
@@ -406,9 +418,10 @@ public class BookmarkableMapperTest extends AbstractMapperTest
};
IRequestHandler handler = encoder.mapRequest(request);
- assertNotNull("A handler should be resolved for relative url to a bookmarkable page url!", handler);
+ assertNotNull("A handler should be resolved for relative url to a bookmarkable page url!",
+ handler);
- IRequestablePage page = ((IPageRequestHandler) handler).getPage();
+ IRequestablePage page = ((IPageRequestHandler)handler).getPage();
assertEquals(page.getClass().getName(), PAGE_CLASS_NAME);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
index a342bd5..5ee7c0c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
@@ -18,11 +18,6 @@ package org.apache.wicket.core.request.mapper;
import org.apache.wicket.MockPage;
import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler;
-import org.apache.wicket.markup.html.link.ILinkListener;
-import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.Url;
-import org.apache.wicket.request.component.IRequestableComponent;
-import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
import org.apache.wicket.core.request.handler.IPageProvider;
import org.apache.wicket.core.request.handler.IPageRequestHandler;
@@ -31,6 +26,11 @@ import org.apache.wicket.core.request.handler.PageAndComponentProvider;
import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
import org.apache.wicket.core.request.mapper.PackageMapperTest.OuterPage.InnerPage;
+import org.apache.wicket.markup.html.link.ILinkListener;
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.IRequestableComponent;
+import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.PackageName;
import org.junit.Test;
@@ -50,6 +50,12 @@ public class PackageMapperTest extends AbstractMapperTest
{
return context;
}
+
+ @Override
+ boolean getRecreateMountedPagesAfterExpiry()
+ {
+ return true;
+ }
};
private static final String PAGE_CLASS_NAME = MockPage.class.getSimpleName();
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 46326a0..e370ee8 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="../page?0-1.ILinkListener-link" wicket:id="link">increment</a>444
+ 333<a href="./org.apache.wicket.markup.MarkupInheritanceExtension_12?0-1.ILinkListener-link" wicket:id="link">increment</a>444
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 d2b418f..9eff1ac 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="../page?0-2.ILinkListener-link" wicket:id="link">increment</a> extension: 2
+ extension: 1 <a href="./org.apache.wicket.markup.MarkupInheritanceExtension_4?0-2.ILinkListener-link" wicket:id="link">increment</a> extension: 2
base: after
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 810bfd1..b6f7e2a 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="../page?0-1.ILinkListener-link" wicket:id="link">increment</a> extension: 2
+ extension: 1 <a href="./org.apache.wicket.markup.MarkupInheritanceExtension_4?0-1.ILinkListener-link" wicket:id="link">increment</a> extension: 2
base: after
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 b7207a7..e20aef9 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="../page?0-1.ILinkListener-link" wicket:id="link">increment</a>444
+ 333<a href="./org.apache.wicket.markup.MarkupInheritanceExtension_5?0-1.ILinkListener-link" wicket:id="link">increment</a>444
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 153b4fb..d59f6d2 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="../page?0-1.ILinkListener-link" wicket:id="link">increment</a>444
+ 333<a href="./org.apache.wicket.markup.MarkupInheritanceExtension_7?0-1.ILinkListener-link" wicket:id="link">increment</a>444
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 4af7a6d..edd5525 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":"../page?0-1.IBehaviorListener.1-html","e":"click","c":"html1"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.basic.SimplePage_13?0-1.IBehaviorListener.1-html","e":"click","c":"html1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 237ccf1..960909a 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":"../page?0-1.IBehaviorListener.0-hideable-hideLink","e":"click","c":"hideLink1"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.border.HideableBorderPage?0-1.IBehaviorListener.0-hideable-hideLink","e":"click","c":"hideLink1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 e013050..97289f7 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="../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="./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>
<span wicket:id="group">
<input type="checkbox" wicket:id="check1" id="check12" name="group" value="check1" checked="checked" disabled="disabled" class="wicket-group3">check1</input>
<span wicket:id="container">
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 d828af9..501d151 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="../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="./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>
<input type="checkbox" wicket:id="check1" id="check12" name="group" value="check1" class="wicket-group3">check1</input>
<span wicket:id="container">
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 4319c90..115ad15 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="form5" 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="form5_hf_0" id="form5_hf_0" /></div>
+ <form wicket:id="form" id="form5" 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="form5_hf_0" id="form5_hf_0" /></div>
<input type="checkbox" wicket:id="check1" id="check16" name="group" value="check1" checked="checked" class="wicket-group7">check1</input>
<span wicket:id="container">
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 5314944..bd20c50 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="form9" 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="form9_hf_0" id="form9_hf_0" /></div>
+ <form wicket:id="form" id="form9" 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="form9_hf_0" id="form9_hf_0" /></div>
<input type="checkbox" wicket:id="check1" id="check1a" name="group" value="check1" class="wicket-groupb">check1</input>
<span wicket:id="container">
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 4d6e429..b3c2419 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="formd" 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="formd_hf_0" id="formd_hf_0" /></div>
+ <form wicket:id="form" id="formd" 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="formd_hf_0" id="formd_hf_0" /></div>
<input type="checkbox" wicket:id="check1" id="check1e" name="group" value="check1" checked="checked" class="wicket-groupf">check1</input>
<span wicket:id="container">
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 ac5dd80..5c824af 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="../page?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="../page"><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.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>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 896b894..cfc8297 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="../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="./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>
<span wicket:id="group">
<input type="radio" wicket:id="radio1" id="radio12" name="group" value="radio1" disabled="disabled" class="wicket-group3">radio1</input>
<span wicket:id="container">
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 6a1dfff..f8308e7 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="../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="./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>
<input type="radio" wicket:id="radio1" id="radio12" name="group" value="radio1" class="wicket-group3">radio1</input>
<span wicket:id="container">
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 18436d5..d715b20 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="../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="./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>
<input wicket:id="check1" type="radio" id="check12" name="radio" value="radio1" checked="checked" class="wicket-radio3">Yes
<input wicket:id="check2" type="radio" id="check24" name="radio" value="radio2" checked="checked" class="wicket-radio3">No
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 31e8249..b349a8e 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="../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="./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>
<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/9c277293/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 5882e81..da7d6b2 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="../page?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.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>
<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/9c277293/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 38848b7..dd0d17b 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="../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="./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>
<input type="text" wicket:id="input" value="" name="input">
</form>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 9173c87..fd9e1fa 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="../page?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.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>
<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/9c277293/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 ac5dd80..726c41a 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="../page?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="../page"><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.IFormSubmitListener-formpost&first=foo&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>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 8851ded..3b8ec37 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="../page?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.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>
<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/9c277293/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 ede8c69..5ba92fb 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="../page?0-1.ILinkListener-link">Replace the panel</a>
+ <a wicket:id="link" href="./org.apache.wicket.markup.html.header.testing3.TestPage?0-1.ILinkListener-link">Replace the panel</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 98ce763..b0b2a08 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="../page?1-2.ILinkListener-link">Replace the panel</a>
+ <a wicket:id="link" href="./org.apache.wicket.markup.html.header.testing3.TestPage?1-2.ILinkListener-link">Replace the panel</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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 c7afd3f..dc10071 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="../page?0-1.ILinkListener-border-border_body-newLink">test</a>
+ <a wicket:id="newLink" href="./org.apache.wicket.markup.html.internal.EnclosurePage_3?0-1.ILinkListener-border-border_body-newLink">test</a>
</div>
</wicket:enclosure>
</wicket:body> after
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/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..0685a74 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="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?2-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
<input wicket:id="input" type="checkbox" name="input"/>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c277293/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
index 6ae92e0..233f38c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
</form>