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/11/11 09:51:22 UTC
[1/6] git commit: WICKET-4997: more restrictive condition for using
bookmarkable urls
Updated Branches:
refs/heads/wicket-6.x 62fed8f5f -> 996313537
WICKET-4997: more restrictive condition for using bookmarkable urls
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/272c5d9b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/272c5d9b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/272c5d9b
Branch: refs/heads/wicket-6.x
Commit: 272c5d9bdeb8e84b1201e65c1462a6b987e28f78
Parents: 6321587
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Wed Aug 21 20:55:41 2013 +0200
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Mon Oct 28 09:45:43 2013 +0100
----------------------------------------------------------------------
.../main/java/org/apache/wicket/Component.java | 6 ++--
.../wicket/ajax/MockComponent3-expected.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 | 33 +++++++++++++++++---
.../wicket/markup/html/link/PageWithLink.java | 7 -----
13 files changed, 43 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/272c5d9b/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 116eb86..d37e660 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -3336,7 +3336,8 @@ public abstract class Component
Page page = getPage();
PageAndComponentProvider provider = new PageAndComponentProvider(page, this, parameters);
IRequestHandler handler;
- if (page.isBookmarkable())
+ if (getApplication().getPageSettings().getRecreateMountedPagesAfterExpiry() &&
+ ((page.isBookmarkable() && page.wasCreatedBookmarkable()) || page.isPageStateless()))
{
handler = new BookmarkableListenerInterfaceRequestHandler(provider, listener, id);
}
@@ -3379,7 +3380,8 @@ public abstract class Component
Page page = getPage();
PageAndComponentProvider provider = new PageAndComponentProvider(page, this, parameters);
IRequestHandler handler;
- if (page.isBookmarkable())
+ if (getApplication().getPageSettings().getRecreateMountedPagesAfterExpiry() &&
+ ((page.isBookmarkable() && page.wasCreatedBookmarkable()) || page.isPageStateless()))
{
handler = new BookmarkableListenerInterfaceRequestHandler(provider, listener);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/272c5d9b/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 f9552b4..7171a53 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/272c5d9b/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 0685a74..21c441d 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="./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>
+ <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>
<!-- 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/272c5d9b/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 233f38c..6ae92e0 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="./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>
+ <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>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
</form>
http://git-wip-us.apache.org/repos/asf/wicket/blob/272c5d9b/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 9e2678d..baeac11 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="./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>
+ <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>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
</form>
http://git-wip-us.apache.org/repos/asf/wicket/blob/272c5d9b/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 9258a54..987b223 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="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?4-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <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>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
</form>
http://git-wip-us.apache.org/repos/asf/wicket/blob/272c5d9b/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 4726ca5..df38e88 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="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?5-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <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>
<!-- 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/272c5d9b/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 9daf8ec..87eb79e 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="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?6-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <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>
<!-- 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/272c5d9b/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 3cd7389..3e86ff0 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="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?3-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <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>
<!-- 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/272c5d9b/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 f4f2a88..2186bd1 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="./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>
+ <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>
<!-- 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/272c5d9b/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 89e606e..638925b 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="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <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>
<!-- 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/272c5d9b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
index 3b10aeb..ae35127 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.link;
+import java.util.Arrays;
+import java.util.Collection;
+
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.core.request.mapper.PageInstanceMapper;
import org.apache.wicket.protocol.http.PageExpiredException;
@@ -23,6 +26,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.settings.IPageSettings;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
/**
* Testcases for links on mounted pages. These links are special, because they refer the page by id
@@ -31,15 +37,30 @@ import org.junit.Test;
*
* @author papegaaij
*/
+@RunWith(Parameterized.class)
public class MountedPageLinkTest extends WicketTestCase
{
+ @Parameters
+ public static Collection<Object[]> data()
+ {
+ return Arrays.asList(new Object[][] { { true }, { false } });
+ }
+
+ private boolean mount;
+
+ public MountedPageLinkTest(boolean mount)
+ {
+ this.mount = mount;
+ }
+
/**
* Mount the page
*/
@Before
public void mountPage()
{
- tester.getApplication().mountPage("mount/${param}/part2", PageWithLink.class);
+ if (mount)
+ tester.getApplication().mountPage("mount/${param}/part2", PageWithLink.class);
}
/**
@@ -52,8 +73,12 @@ public class MountedPageLinkTest extends WicketTestCase
new PageParameters().add("param", "value"));
Link<?> link = (Link<?>)page.get("link");
String url = link.getURL().toString();
- assertTrue("URL for link should contain 'mount/value/part2': " + url, url.toString()
- .contains("mount/value/part2"));
+ if (mount)
+ assertTrue("URL for link should contain 'mount/value/part2': " + url, url.toString()
+ .contains("mount/value/part2"));
+ else
+ assertTrue("URL for link should contain 'param=value': " + url, url.toString()
+ .contains("param=value"));
tester.executeUrl(url);
}
@@ -71,7 +96,7 @@ public class MountedPageLinkTest extends WicketTestCase
Link<?> link = (Link<?>)page.get("link");
String url = link.getURL().toString();
// simulate a page expiry
- url = url.replace("part2?0", "part2?3");
+ url = url.replace("?0", "?3");
tester.executeUrl(url);
// request parameters to callback urls should be ignored for the re-created page
http://git-wip-us.apache.org/repos/asf/wicket/blob/272c5d9b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
index 6f7fc4c..e6af20c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
@@ -41,13 +41,6 @@ public class PageWithLink extends WebPage
}
@Override
- public boolean isBookmarkable()
- {
- // not bookmarkable because ${param} is required
- return false;
- }
-
- @Override
public void renderHead(IHeaderResponse response)
{
super.renderHead(response);
[6/6] git commit: Merge remote-tracking branch 'origin/wicket-4997'
into wicket-6.x
Posted by pa...@apache.org.
Merge remote-tracking branch 'origin/wicket-4997' into wicket-6.x
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/99631353
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/99631353
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/99631353
Branch: refs/heads/wicket-6.x
Commit: 996313537f0c0d7efccc108d810d61f2626b099c
Parents: 62fed8f 272c5d9
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Mon Nov 11 09:51:05 2013 +0100
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Mon Nov 11 09:51:05 2013 +0100
----------------------------------------------------------------------
.../main/java/org/apache/wicket/Component.java | 6 +-
.../mapper/AbstractBookmarkableMapper.java | 13 +++-
.../core/request/mapper/MountedMapper.java | 41 +++++-------
.../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 +-
.../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 +-
.../BoxBorderTestPage_ExpectedResult_11.html | 2 +-
.../BoxBorderTestPage_ExpectedResult_3.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 +-
.../markup/html/link/MountedPageLinkTest.java | 36 ++++++++--
...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 +--
83 files changed, 371 insertions(+), 319 deletions(-)
----------------------------------------------------------------------
[3/6] WICKET-4997: fix testcases
Posted by pa...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
index 6ae92e0..233f38c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
</form>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
index baeac11..9e2678d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?2-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?2-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
</form>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
index 987b223..9258a54 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?4-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?4-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
</form>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
index df38e88..4726ca5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?5-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?5-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
index 87eb79e..9daf8ec 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?6-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?6-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
<input wicket:id="input" type="checkbox" name="input"/>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
index 3e86ff0..3cd7389 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?3-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?3-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
index 2186bd1..f4f2a88 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
<input wicket:id="input" type="checkbox" checked="checked" name="input"/>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html
index 638925b..89e606e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./bookmarkable/org.apache.wicket.markup.html.internal.EnclosurePage_9?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
<input wicket:id="input" type="checkbox" name="input"/>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
index f273606..3b10aeb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
@@ -74,7 +74,8 @@ public class MountedPageLinkTest extends WicketTestCase
url = url.replace("part2?0", "part2?3");
tester.executeUrl(url);
- // request parameters to callback urls should be ignored for the re-created page (WICKET-4594)
+ // request parameters to callback urls should be ignored for the re-created page
+ // (WICKET-4594)
tester.assertContainsNot("param=value");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
index e6af20c..6f7fc4c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
@@ -41,6 +41,13 @@ public class PageWithLink extends WebPage
}
@Override
+ public boolean isBookmarkable()
+ {
+ // not bookmarkable because ${param} is required
+ return false;
+ }
+
+ @Override
public void renderHead(IHeaderResponse response)
{
super.renderHead(response);
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
index ff79a37..625af01 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
@@ -3,6 +3,6 @@
<title>Paged Table Page</title>
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li wicket:id="table"><span wicket:id="txt">six</span></li></ul>
-<a wicket:id="prev" href="../page?1-2.ILinkListener-prev">Prev</a><a wicket:id="nextNext" href="../page?1-2.ILinkListener-nextNext">NextNext</a>
+<a wicket:id="prev" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?1-2.ILinkListener-prev">Prev</a><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?1-2.ILinkListener-nextNext">NextNext</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
index 4313e29..d7e9fac 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
@@ -3,6 +3,6 @@
<title>Paged Table Page</title>
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
-<a wicket:id="prev" href="../page?2-3.ILinkListener-prev">Prev</a><a wicket:id="nextNext" href="../page?2-3.ILinkListener-nextNext">NextNext</a>
+<a wicket:id="prev" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?2-3.ILinkListener-prev">Prev</a><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?2-3.ILinkListener-nextNext">NextNext</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
index 2005ebe..d89ceab 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
@@ -3,6 +3,6 @@
<title>Paged Table Page</title>
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul>
-<span wicket:id="prev"><em>Prev</em></span><a wicket:id="nextNext" href="../page?0-1.ILinkListener-nextNext">NextNext</a>
+<span wicket:id="prev"><em>Prev</em></span><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?0-1.ILinkListener-nextNext">NextNext</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
index 6b2d50f..393c63a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
@@ -23,14 +23,14 @@
<span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-1.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-1.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
index f14b6f8..d7062c3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
@@ -18,19 +18,19 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="../page?0-2.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" class="prev" href="../page?0-2.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></span>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-2.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-2.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
index bfdafd6..88e9a07 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
@@ -23,14 +23,14 @@
<span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-3.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-3.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
index 5bf540d..f6c87e5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
@@ -18,14 +18,14 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">seven</span></li><li wicket:id="table"><span wicket:id="txt">eight</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="../page?0-4.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" class="prev" href="../page?0-4.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 4"><em><span wicket:id="pageNumber">4</span></em></span>
</span>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
index 7c3ca69..f60bfae 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
@@ -23,14 +23,14 @@
<span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-5.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-5.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
index 15e9544..9544cc1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
@@ -18,19 +18,19 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li wicket:id="table"><span wicket:id="txt">six</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="../page?0-6.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" class="prev" href="../page?0-6.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 3"><em><span wicket:id="pageNumber">3</span></em></span>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-6.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-6.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
index d59bc46..45caf48 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
@@ -18,19 +18,19 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="../page?0-7.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" class="prev" href="../page?0-7.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></span>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-7.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-7.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
index 7dd02be..15dc522 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
@@ -23,18 +23,18 @@
<span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-8.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-8.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-8.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-8.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-8.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-8.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-8.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
index dcc15d8..afbd820 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
@@ -23,20 +23,20 @@
<span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-1.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-1.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
index 542d92c..898180c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
@@ -18,25 +18,25 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="../page?0-2.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" class="prev" href="../page?0-2.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
</span><span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">3-4</span></em></span>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-2.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-2.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
index 8806fbf..1cb8a9d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
@@ -23,20 +23,20 @@
<span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-3.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-3.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
index 5026117..0e581ec 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
@@ -18,20 +18,20 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">thirteen</span></li><li wicket:id="table"><span wicket:id="txt">fourteen</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="../page?0-4.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" class="prev" href="../page?0-4.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 7"><em><span wicket:id="pageNumber">13-14</span></em></span>
</span>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
index f726765..7540fa9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
@@ -23,20 +23,20 @@
<span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-5.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-5.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
index 7380a8c..b224efa 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
@@ -18,25 +18,25 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">seven</span></li><li wicket:id="table"><span wicket:id="txt">eight</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="../page?0-6.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" class="prev" href="../page?0-6.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 4"><em><span wicket:id="pageNumber">7-8</span></em></span>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-6.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-6.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
index 075d95b..5ddfe86 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
@@ -18,25 +18,25 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li wicket:id="table"><span wicket:id="txt">six</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="../page?0-7.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" class="prev" href="../page?0-7.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 3"><em><span wicket:id="pageNumber">5-6</span></em></span>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-7.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-7.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
index 739599c..5ac6fdc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
@@ -23,16 +23,16 @@
<span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-1.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-1.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
index 242d716..c30775d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
@@ -18,21 +18,21 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="../page?0-2.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" class="prev" href="../page?0-2.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span>, <span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></span>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-2.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-2.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
index efbf626..d978cf6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
@@ -23,16 +23,16 @@
<span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-3.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-3.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
index 49be322..d032d92 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
@@ -18,16 +18,16 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">thirteen</span></li><li wicket:id="table"><span wicket:id="txt">fourteen</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="../page?0-4.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" class="prev" href="../page?0-4.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
</span>, <span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 7"><em><span wicket:id="pageNumber">7</span></em></span>
</span>
[2/6] WICKET-4997: fix testcases
Posted by pa...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/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 6ae349d..47d3c8f 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">
<span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-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.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-5.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-5.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/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 c3e01a3..5d5bc44 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="../page?0-6.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" class="prev" href="../page?0-6.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?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.ILinkListener-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="../page?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.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 4"><em><span wicket:id="pageNumber">4</span></em></span>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?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.ILinkListener-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="../page?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.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-6.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-6.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/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 38a4bb6..e1909f5 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="../page?0-7.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" class="prev" href="../page?0-7.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?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.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
<span wicket:id="pageLink" title="Go to page 3"><em><span wicket:id="pageNumber">3</span></em></span>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-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.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="../page?0-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.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span>
- <a wicket:id="next" class="next" href="../page?0-7.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="../page?0-7.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-next" title="Go to next page">></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">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/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 63766e5..9d0a3e3 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="../page?1-2.ILinkListener-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a></li><li wicket:id="navigation"><span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></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"><span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></span></li></ul>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/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 23a060a..b005bf6 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":"../page?0-1.IBehaviorListener.0-provider-ajaxRefresh","e":"click","c":"ajaxRefresh1"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_7?0-1.IBehaviorListener.0-provider-ajaxRefresh","e":"click","c":"ajaxRefresh1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/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 25731bd..e53fe79 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":"../page?0-1.IBehaviorListener.0-add","e":"click","c":"add1"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_8?0-1.IBehaviorListener.0-add","e":"click","c":"add1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/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 ba79cf8..2545175 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="../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.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>
</body>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/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 236f58b..ff8b622 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="../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.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>
<input wicket:id="input" type="text" value="" name="input">
</form>
</body>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/protocol/http/TestExpirePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/TestExpirePage.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/TestExpirePage.java
index 4063ef8..6f64c75 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/TestExpirePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/TestExpirePage.java
@@ -43,4 +43,9 @@ public class TestExpirePage extends WebPage
});
}
+ @Override
+ public boolean isBookmarkable()
+ {
+ return false;
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/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 a4905c1..ca9fe5c 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
@@ -104,8 +104,8 @@ Wicket.DateTimeInit.CalendarAdd(function() {
</script>
</head>
<body>
-<form wicket:id="localeForm" id="localeForm2" method="post" action="../page?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('localeForm2_hf_0').value='./page?0-1.IOnChangeListener-localeForm-localeSelect';document.getElementById('localeForm2').submit();" name="localeSelect">
+<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('localeForm2_hf_0').value='../../page?0-1.IOnChangeListener-localeForm-localeSelect';document.getElementById('localeForm2').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>
@@ -126,10 +126,10 @@ Wicket.DateTimeInit.CalendarAdd(function() {
<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="../page?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.ILinkListener-localeForm-localeUSLink" wicket:id="localeUSLink">set to english</a>]</p>
</form>
<p>
-<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><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.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"/>
<span class="yui-skin-sam"> <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>
[4/6] git commit: WICKET-4997: fix testcases
Posted by pa...@apache.org.
WICKET-4997: fix testcases
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6321587e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6321587e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6321587e
Branch: refs/heads/wicket-6.x
Commit: 6321587ef3b67835f6ff0e8dda929f89889e0948
Parents: b30455f
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 09:45:43 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 +-
.../BoxBorderTestPage_ExpectedResult_11.html | 2 +-
.../BoxBorderTestPage_ExpectedResult_3.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 +--
91 files changed, 328 insertions(+), 296 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/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/6321587e/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 08bf1a0..95f9686 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.1.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.1.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/6321587e/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 2d7ef25..849f464 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/6321587e/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 c49bb49..e34734d 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/6321587e/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/6321587e/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 cf6c516..494c254 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.1.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.1.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/6321587e/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 fa95d87..546e3a5 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":"../page?0-1.IBehaviorListener.0-link","e":"click","c":"link1"});;
+Wicket.Ajax.ajax({"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/6321587e/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 2a9e64e..fb9d869 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.1.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.1.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/6321587e/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 730e74f..1bb3502 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":"../page?0-1.IBehaviorListener.0-link","e":"click","c":"link1"});;
+Wicket.Ajax.ajax({"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/6321587e/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 96264d5..9802ffa 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.1.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.1.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({"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({"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/6321587e/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 edd508a..44c008f 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({"u":"../page?0-1.IBehaviorListener.0-test","e":"click","c":"test1"});;
+Wicket.Ajax.ajax({"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/6321587e/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/6321587e/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 53b8826..1fc15c1 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({"f":"form1","u":"../page?0-1.IBehaviorListener.0-form-submit","e":"click","c":"submit2","sc":":submit","m":"POST"});;
+Wicket.Ajax.ajax({"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/6321587e/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 9c3cd28..563d06d 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","ad":true,"m":"POST"});;
-Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.0-form-dropDown","e":"inputchange change","c":"dropDown2","ad":true,"m":"POST"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.IBehaviorListener.0-form-field","e":"inputchange change","c":"field1","ad":true,"m":"POST"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.IBehaviorListener.0-form-dropDown","e":"inputchange change","c":"dropDown2","ad":true,"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/6321587e/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 6ca1167..dfe352c 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/6321587e/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 9e57e6e..7ce40b9 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/6321587e/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 34772dc..749c7cd 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/6321587e/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 67c9472..b964a54 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.1.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.1.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/6321587e/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 d8e25ea..8008fff 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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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 f99e524..7196ec1 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/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_11.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_11.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_11.html
index 6fd3ed6..728d7bf 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_11.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_11.html
@@ -15,7 +15,7 @@
<html>
<body>
<span wicket:id="border"><wicket:border>
- <h3 class="collapse" wicket:id="title" onclick="var win = this.ownerDocument.defaultView || this.ownerDocument.parentWindow; if (win == window) { window.location.href='../page?0-1.ILinkListener-border-title'; } ;return false">
+ <h3 class="collapse" wicket:id="title" onclick="var win = this.ownerDocument.defaultView || this.ownerDocument.parentWindow; if (win == window) { window.location.href='./org.apache.wicket.markup.html.border.BoxBorderTestPage_11?0-1.ILinkListener-border-title'; } ;return false">
<span class="label" wicket:id="titleLabel">model</span>
<a class="foldicon"> </a>
</h3>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html
index f7c716a..a035b01 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<body>
<span wicket:id="border"><wicket:border>
- <form wicket:id="myForm" id="myForm1" method="post" action="../page?0-1.IFormSubmitListener-border-myForm"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="myForm1_hf_0" id="myForm1_hf_0" /></div>
+ <form wicket:id="myForm" id="myForm1" method="post" action="./org.apache.wicket.markup.html.border.BoxBorderTestPage_3?0-1.IFormSubmitListener-border-myForm"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="myForm1_hf_0" id="myForm1_hf_0" /></div>
<wicket:body>
<input type="text" wicket:id="name" value="" name="border_body:name"/>
</wicket:body>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6321587e/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 a87fd9b..82eb05c 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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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/6321587e/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"/>
[5/6] git commit: WICKET-4997: render bookmarkable urls for
bookmarkable pages (not stateless)
Posted by pa...@apache.org.
WICKET-4997: render bookmarkable urls for bookmarkable pages (not stateless)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b30455fa
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b30455fa
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b30455fa
Branch: refs/heads/wicket-6.x
Commit: b30455facc2fcadca9dea2365bf2f7c40ff25750
Parents: 41344ae
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Mon Aug 19 11:07:41 2013 +0200
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Mon Oct 28 09:45:43 2013 +0100
----------------------------------------------------------------------
.../main/java/org/apache/wicket/Component.java | 4 +-
.../mapper/AbstractBookmarkableMapper.java | 13 +++++--
.../core/request/mapper/MountedMapper.java | 41 ++++++++------------
3 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b30455fa/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 8fa63a3..116eb86 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -3336,7 +3336,7 @@ public abstract class Component
Page page = getPage();
PageAndComponentProvider provider = new PageAndComponentProvider(page, this, parameters);
IRequestHandler handler;
- if (page.isPageStateless())
+ if (page.isBookmarkable())
{
handler = new BookmarkableListenerInterfaceRequestHandler(provider, listener, id);
}
@@ -3379,7 +3379,7 @@ public abstract class Component
Page page = getPage();
PageAndComponentProvider provider = new PageAndComponentProvider(page, this, parameters);
IRequestHandler handler;
- if (page.isPageStateless())
+ if (page.isBookmarkable())
{
handler = new BookmarkableListenerInterfaceRequestHandler(provider, listener);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/b30455fa/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
index 93c22d2..bbe2e1c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
@@ -210,8 +210,7 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper
PageProvider provider = new PageProvider(pageInfo.getPageId(), pageClass, pageParameters,
renderCount);
provider.setPageSource(getContext());
- if (provider.isNewPageInstance() &&
- !WebApplication.get().getPageSettings().getRecreateMountedPagesAfterExpiry())
+ if (provider.isNewPageInstance() && !getRecreateMountedPagesAfterExpiry())
{
throw new PageExpiredException(String.format("Bookmarkable page id '%d' has expired.",
pageInfo.getPageId()));
@@ -222,6 +221,11 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper
}
}
+ boolean getRecreateMountedPagesAfterExpiry()
+ {
+ return WebApplication.get().getPageSettings().getRecreateMountedPagesAfterExpiry();
+ }
+
/**
* Creates a {@code IRequestHandler} that processes a listener request.
*
@@ -420,8 +424,11 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper
requestListenerInterfaceToString(handler.getListenerInterface()),
handler.getComponentPath(), handler.getBehaviorIndex());
+ PageParameters parameters = getRecreateMountedPagesAfterExpiry() ? new PageParameters(
+ handler.getPage().getPageParameters()).mergeWith(handler.getPageParameters())
+ : handler.getPageParameters();
UrlInfo urlInfo = new UrlInfo(new PageComponentInfo(pageInfo, componentInfo),
- pageClass, handler.getPageParameters());
+ pageClass, parameters);
return buildUrl(urlInfo);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/b30455fa/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
index 9b1db28..19212b6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
@@ -19,7 +19,6 @@ package org.apache.wicket.core.request.mapper;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.Application;
import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
import org.apache.wicket.request.IRequestHandler;
@@ -49,21 +48,21 @@ import org.apache.wicket.util.string.Strings;
* are matched before optional parameters, and optional parameters eager (from left to right).
* <p>
* Decodes and encodes the following URLs:
- *
+ *
* <pre>
* Page Class - Render (BookmarkablePageRequestHandler for mounted pages)
* /mount/point
* (these will redirect to hybrid alternative if page is not stateless)
- *
+ *
* IPage Instance - Render Hybrid (RenderPageRequestHandler for mounted pages)
* /mount/point?2
- *
+ *
* IPage Instance - Bookmarkable Listener (BookmarkableListenerInterfaceRequestHandler for mounted pages)
* /mount/point?2-click-foo-bar-baz
* /mount/point?2-5.click.1-foo-bar-baz (1 is behavior index, 5 is render count)
* (these will redirect to hybrid if page is not stateless)
* </pre>
- *
+ *
* @author Matej Knopp
*/
public class MountedMapper extends AbstractBookmarkableMapper
@@ -143,7 +142,7 @@ public class MountedMapper extends AbstractBookmarkableMapper
/**
* Construct.
- *
+ *
* @param mountPath
* @param pageClass
*/
@@ -154,32 +153,32 @@ public class MountedMapper extends AbstractBookmarkableMapper
/**
* Construct.
- *
+ *
* @param mountPath
* @param pageClassProvider
*/
@Deprecated
public MountedMapper(String mountPath,
- ClassProvider<? extends IRequestablePage> pageClassProvider)
+ ClassProvider<? extends IRequestablePage> pageClassProvider)
{
this(mountPath, new ClassReference(pageClassProvider.get()), new PageParametersEncoder());
}
/**
* Construct.
- *
+ *
* @param mountPath
* @param pageClassProvider
*/
public MountedMapper(String mountPath,
- IProvider<Class<? extends IRequestablePage>> pageClassProvider)
+ IProvider<Class<? extends IRequestablePage>> pageClassProvider)
{
this(mountPath, pageClassProvider, new PageParametersEncoder());
}
/**
* Construct.
- *
+ *
* @param mountPath
* @param pageClass
* @param pageParametersEncoder
@@ -192,7 +191,7 @@ public class MountedMapper extends AbstractBookmarkableMapper
/**
* Construct.
- *
+ *
* @param mountPath
* @param pageClassProvider
* @param pageParametersEncoder
@@ -202,20 +201,19 @@ public class MountedMapper extends AbstractBookmarkableMapper
ClassProvider<? extends IRequestablePage> pageClassProvider,
IPageParametersEncoder pageParametersEncoder)
{
- this(mountPath, new ClassReference(pageClassProvider.get()),
- pageParametersEncoder);
+ this(mountPath, new ClassReference(pageClassProvider.get()), pageParametersEncoder);
}
/**
* Construct.
- *
+ *
* @param mountPath
* @param pageClassProvider
* @param pageParametersEncoder
*/
public MountedMapper(String mountPath,
- IProvider<Class<? extends IRequestablePage>> pageClassProvider,
- IPageParametersEncoder pageParametersEncoder)
+ IProvider<Class<? extends IRequestablePage>> pageClassProvider,
+ IPageParametersEncoder pageParametersEncoder)
{
Args.notEmpty(mountPath, "mountPath");
Args.notNull(pageClassProvider, "pageClassProvider");
@@ -427,11 +425,6 @@ public class MountedMapper extends AbstractBookmarkableMapper
return url;
}
- boolean getRecreateMountedPagesAfterExpiry()
- {
- return Application.get().getPageSettings().getRecreateMountedPagesAfterExpiry();
- }
-
/**
* @see AbstractBookmarkableMapper#buildUrl(AbstractBookmarkableMapper.UrlInfo)
*/
@@ -483,7 +476,7 @@ public class MountedMapper extends AbstractBookmarkableMapper
/**
* Check if the URL is for home page and the home page class match mounted class. If so,
* redirect to mounted URL.
- *
+ *
* @param url
* @return request handler or <code>null</code>
*/
@@ -504,7 +497,7 @@ public class MountedMapper extends AbstractBookmarkableMapper
* If this method returns <code>true</code> and application home page class is same as the class
* mounted with this encoder, request to home page will result in a redirect to the mounted
* path.
- *
+ *
* @return whether this encode should respond to home page request when home page class is same
* as mounted class.
*/