You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2012/03/13 17:37:53 UTC
git commit: WICKET-4260 make sure relative urls start either with dot
or dot-dot
Updated Branches:
refs/heads/wicket-1.5.x 51e8c9af8 -> f1fa8377c
WICKET-4260 make sure relative urls start either with dot or dot-dot
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f1fa8377
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f1fa8377
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f1fa8377
Branch: refs/heads/wicket-1.5.x
Commit: f1fa8377cf21ecc8a0bceb393c3a75f51ebddd52
Parents: 51e8c9a
Author: Sven Meier <sv...@apache.org>
Authored: Tue Mar 13 17:36:00 2012 +0100
Committer: Sven Meier <sv...@apache.org>
Committed: Tue Mar 13 17:36:00 2012 +0100
----------------------------------------------------------------------
.../wicket/util/tester/BaseWicketTester.java | 10 ++-
.../apache/wicket/TestDetachPageAjaxResult.html | 8 +-
.../ajax/DomReadyOrderPage_ajax_expected.html | 8 +-
.../wicket/ajax/MockComponent3-expected.html | 2 +-
.../AjaxCallDecoratorDelegateTest.java | 50 +++++++++------
.../SimpleTestPageExpectedResult-1.html | 8 +-
.../markup/html/autolink/Index_ExpectedResult.html | 4 +-
.../markup/html/autolink/MyPageExpectedResult.html | 6 +-
.../markup/html/autolink/PageAExpectedResult.html | 4 +-
.../html/basic/SimplePageExpectedResult_12.html | 10 ++--
.../html/basic/SimplePageExpectedResult_7.html | 2 +-
.../DropDownChoiceTestPage_A_false_expected.html | 2 +-
.../DropDownChoiceTestPage_A_true_expected.html | 2 +-
...DropDownChoiceTestPage_null_false_expected.html | 2 +-
.../DropDownChoiceTestPage_null_true_expected.html | 2 +-
.../EnclosurePageExpectedResult_9-1-1.html | 2 +-
.../internal/EnclosurePageExpectedResult_9-1.html | 2 +-
.../EnclosurePageExpectedResult_9-2-1.html | 2 +-
.../internal/EnclosurePageExpectedResult_9-2.html | 16 +++---
.../EnclosurePageExpectedResult_9-3-1.html | 2 +-
.../EnclosurePageExpectedResult_9-3-2.html | 2 +-
.../internal/EnclosurePageExpectedResult_9-3.html | 2 +-
.../internal/EnclosurePageExpectedResult_9-4.html | 2 +-
.../internal/EnclosurePageExpectedResult_9.html | 2 +-
.../html/link/AutolinkPageExpectedResult_1.html | 12 ++--
.../html/link/AutolinkPageExpectedResult_2.html | 12 ++--
.../html/link/AutolinkPageExpectedResult_3.html | 2 +-
.../html/link/AutolinkPageExpectedResult_4.html | 2 +-
.../markup/html/link/BookmarkablePageLinkTest.java | 2 +-
.../markup/html/link/MountedPageLinkTest.java | 4 +-
.../resolver/SimplePageExpectedResult_2.html | 2 +-
.../resolver/SimplePageExpectedResult_2a.html | 2 +-
.../wicket/request/cycle/UrlRendererTest.java | 22 +++---
...mponentPageWithParams_indexed_mount_result.html | 2 +-
...telessComponentPageWithParams_mount_result.html | 2 +-
.../StatelessComponentPageWithParams_result.html | 2 +-
.../StatelessComponentPage_mount_result.html | 2 +-
.../stateless/StatelessComponentPage_result.html | 2 +-
.../stateless/StatelessPageWithForm_expected.html | 2 +-
.../yui/calendar/DatesPage1_ExpectedResult.html | 2 +-
.../markup/html/AjaxLazyLoadPanelTesterTest.java | 2 +-
.../org/apache/wicket/request/UrlRenderer.java | 16 ++---
42 files changed, 127 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index 8ab6671..9fdde6c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -43,6 +43,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import junit.framework.AssertionFailedError;
+
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.IPageManagerProvider;
@@ -980,7 +981,8 @@ public class BaseWicketTester
{
Args.notNull(link, "link");
- return link.urlFor(ILinkListener.INTERFACE, new PageParameters()).toString();
+ Url url = Url.parse(link.urlFor(ILinkListener.INTERFACE, new PageParameters()).toString());
+ return transform(url).toString();
}
/**
@@ -1972,7 +1974,8 @@ public class BaseWicketTester
*/
private Url transform(final Url url)
{
- while (url.getSegments().size() > 0 && url.getSegments().get(0).equals(".."))
+ while (url.getSegments().size() > 0 &&
+ (url.getSegments().get(0).equals("..") || url.getSegments().get(0).equals(".")))
{
url.getSegments().remove(0);
}
@@ -2247,7 +2250,8 @@ public class BaseWicketTester
{
if (log.isDebugEnabled())
{
- log.debug("Triggering AjaxSelfUpdatingTimerBehavior: {}", component.getClassRelativePath());
+ log.debug("Triggering AjaxSelfUpdatingTimerBehavior: {}",
+ component.getClassRelativePath());
}
executeBehavior(timer);
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/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 b7398e8..eb5b9a9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
-<script type="text/javascript" src="resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
-<script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="./resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
+<script type="text/javascript" src="./resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
+<script type="text/javascript" src="./resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
wicketAjaxDebugEnable=true;
@@ -11,4 +11,4 @@ wicketAjaxDebugEnable=true;
Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.0-comp";
/*]^]^>*/
</script>
-</head>]]></header-contribution><component id="comp1" ><![CDATA[<span wicket:id="comp" id="comp1" onclick="var wcall=wicketAjaxGet('page?0-1.IBehaviorListener.0-comp',function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('comp1') != null;}.bind(this));">body</span>]]></component></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><component id="comp1" ><![CDATA[<span wicket:id="comp" id="comp1" onclick="var wcall=wicketAjaxGet('./page?0-1.IBehaviorListener.0-comp',function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('comp1') != null;}.bind(this));">body</span>]]></component></ajax-response>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/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 9b04394..8a99294 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,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
-<script type="text/javascript" src="resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
-<script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="./resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
+<script type="text/javascript" src="./resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
+<script type="text/javascript" src="./resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
wicketAjaxDebugEnable=true;
@@ -11,4 +11,4 @@ wicketAjaxDebugEnable=true;
Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.0-test";
/*]^]^>*/
</script>
-</head>]]></header-contribution><component id="test1" ><![CDATA[<a href="page?0-1.ILinkListener-test" wicket:id="test" id="test1" onclick="var wcall=wicketAjaxGet('page?0-1.IBehaviorListener.0-test',function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('test1') != null;}.bind(this));return !wcall;">Test</a>]]></component><evaluate><![CDATA[test1();]]></evaluate><evaluate><![CDATA[test2();]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><component id="test1" ><![CDATA[<a href="./page?0-1.ILinkListener-test" wicket:id="test" id="test1" onclick="var wcall=wicketAjaxGet('./page?0-1.IBehaviorListener.0-test',function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('test1') != null;}.bind(this));return !wcall;">Test</a>]]></component><evaluate><![CDATA[test1();]]></evaluate><evaluate><![CDATA[test2();]]></evaluate></ajax-response>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/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 8b6137f..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/f1fa8377/wicket-core/src/test/java/org/apache/wicket/ajax/calldecorator/AjaxCallDecoratorDelegateTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/calldecorator/AjaxCallDecoratorDelegateTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/calldecorator/AjaxCallDecoratorDelegateTest.java
index 49be0f0..1fcca66 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/calldecorator/AjaxCallDecoratorDelegateTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/calldecorator/AjaxCallDecoratorDelegateTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
/**
* Tests for IAjaxCallDecoratorDelegate
- *
+ *
* @since 1.5
*/
public class AjaxCallDecoratorDelegateTest extends WicketTestCase
@@ -43,46 +43,56 @@ public class AjaxCallDecoratorDelegateTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-4347
*/
@Test
- public void delegateShouldContributeToTheHeader() {
-
+ public void delegateShouldContributeToTheHeader()
+ {
+
tester.startPage(new HomePage());
- tester.assertContains("<script type=\"text/javascript\" src=\"resource/org.apache.wicket.ajax.calldecorator.AjaxCallDecoratorDelegateTest\\$ContributingDecorator/myscript.js\"></script>");
+ tester.assertContains("<script type=\"text/javascript\" src=\"./resource/org.apache.wicket.ajax.calldecorator.AjaxCallDecoratorDelegateTest\\$ContributingDecorator/myscript.js\"></script>");
}
-
+
private static class HomePage extends WebPage implements IMarkupResourceStreamProvider
{
- public HomePage() {
- add(new AjaxLink("link") {
-
+ public HomePage()
+ {
+ add(new AjaxLink("link")
+ {
+
@Override
- public void onClick(AjaxRequestTarget target) {
+ public void onClick(AjaxRequestTarget target)
+ {
}
-
+
@Override
- protected IAjaxCallDecorator getAjaxCallDecorator() {
+ protected IAjaxCallDecorator getAjaxCallDecorator()
+ {
return new ContributingDecorator(super.getAjaxCallDecorator());
}
});
}
- public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass)
+ public IResourceStream getMarkupResourceStream(MarkupContainer container,
+ Class<?> containerClass)
{
- return new StringResourceStream("<html><body><a wicket:id='link'>link</a></body></html>");
+ return new StringResourceStream(
+ "<html><body><a wicket:id='link'>link</a></body></html>");
}
}
-
- private static class ContributingDecorator
- extends AjaxPreprocessingCallDecorator
- implements IComponentAwareHeaderContributor
+
+ private static class ContributingDecorator extends AjaxPreprocessingCallDecorator
+ implements
+ IComponentAwareHeaderContributor
{
- private ContributingDecorator(IAjaxCallDecorator delegate) {
+ private ContributingDecorator(IAjaxCallDecorator delegate)
+ {
super(delegate);
}
- public void renderHead(Component component, IHeaderResponse response) {
- response.renderJavaScriptReference(new PackageResourceReference(getClass(), "myscript.js"));
+ public void renderHead(Component component, IHeaderResponse response)
+ {
+ response.renderJavaScriptReference(new PackageResourceReference(getClass(),
+ "myscript.js"));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/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 ecaa81c..57ad6fe 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,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
-<script type="text/javascript" src="resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
-<script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="./resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
+<script type="text/javascript" src="./resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
+<script type="text/javascript" src="./resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
wicketAjaxDebugEnable=true;
@@ -11,4 +11,4 @@ wicketAjaxDebugEnable=true;
Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1";
/*]^]^>*/
</script>
-</head>]]></header-contribution><component id="linja11" ><![CDATA[<span wicket:id="linja1" id="linja11">1</span>]]></component><evaluate><![CDATA[setTimeout("var wcall=wicketAjaxGet('page?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1',function() { }.bind(this),function() { }.bind(this), function() {var c = Wicket.$('linja11'); return typeof(c) != 'undefined' && c != null}.bind(this));", 2000);]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><component id="linja11" ><![CDATA[<span wicket:id="linja1" id="linja11">1</span>]]></component><evaluate><![CDATA[setTimeout("var wcall=wicketAjaxGet('./page?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1',function() { }.bind(this),function() { }.bind(this), function() {var c = Wicket.$('linja11'); return typeof(c) != 'undefined' && c != null}.bind(this));", 2000);]]></evaluate></ajax-response>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/Index_ExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/Index_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/Index_ExpectedResult.html
index 5eebd04..ab47fe4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/Index_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/Index_ExpectedResult.html
@@ -12,10 +12,10 @@
<div wicket:id="linkPanel"><wicket:panel>
<ul>
<li>
- <a href="org.apache.wicket.markup.html.autolink.Index" wicket:id="indexLink">Index</a>
+ <a href="./org.apache.wicket.markup.html.autolink.Index" wicket:id="indexLink">Index</a>
</li>
<li>
- <a href="org.apache.wicket.markup.html.autolink.SubPage" wicket:id="subPageLink">SubPage</a>
+ <a href="./org.apache.wicket.markup.html.autolink.SubPage" wicket:id="subPageLink">SubPage</a>
</li>
</ul>
</wicket:panel></div>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html
index 26bdc63..97c05cd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html
@@ -3,13 +3,13 @@
<body>
<wicket:link>
<span><em>My Page</em></span>
- <a href="org.apache.wicket.markup.html.autolink.PageA">Page A</a>
- <a href="org.apache.wicket.markup.html.autolink.sub.PageB">Page B</a>
+ <a href="./org.apache.wicket.markup.html.autolink.PageA">Page A</a>
+ <a href="./org.apache.wicket.markup.html.autolink.sub.PageB">Page B</a>
</wicket:link>
START<br>
<wicket:child><wicket:extend>
<wicket:link>
- <a href="org.apache.wicket.markup.html.autolink.PageA?a=1">Page A</a>
+ <a href="./org.apache.wicket.markup.html.autolink.PageA?a=1">Page A</a>
</wicket:link>
MyPage
</wicket:extend></wicket:child>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html
index 7dee8d7..056b1ad 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html
@@ -2,9 +2,9 @@
<html>
<body>
<wicket:link>
- <a href="org.apache.wicket.markup.html.autolink.MyPage">My Page</a>
+ <a href="./org.apache.wicket.markup.html.autolink.MyPage">My Page</a>
<span><em>Page A</em></span>
- <a href="org.apache.wicket.markup.html.autolink.sub.PageB">Page B</a>
+ <a href="./org.apache.wicket.markup.html.autolink.sub.PageB">Page B</a>
</wicket:link>
START<br>
<wicket:child><wicket:extend>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_12.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_12.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_12.html
index 04e8d7f..4bfb373 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_12.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_12.html
@@ -13,23 +13,23 @@
<wicket:link>
<!--[if IE]>
- <a href="org.apache.wicket.markup.html.basic.SimplePage_3">Link</a>
+ <a href="./org.apache.wicket.markup.html.basic.SimplePage_3">Link</a>
<![endif]-->
<!--[if IE 6]>
- <a href="org.apache.wicket.markup.html.basic.SimplePage_3">Link</a>
+ <a href="./org.apache.wicket.markup.html.basic.SimplePage_3">Link</a>
<![endif]-->
<!--[if gte IE 5.5]>
- <a href="org.apache.wicket.markup.html.basic.SimplePage_3">Link</a>
+ <a href="./org.apache.wicket.markup.html.basic.SimplePage_3">Link</a>
<![endif]-->
<!--[if lte IE 5.5999]>
- <a href="org.apache.wicket.markup.html.basic.SimplePage_3">Link</a>
+ <a href="./org.apache.wicket.markup.html.basic.SimplePage_3">Link</a>
<![endif]-->
<!--[if lt IE 5.1]>
- <a href="org.apache.wicket.markup.html.basic.SimplePage_3" wicket:id="link">Link</a>
+ <a href="./org.apache.wicket.markup.html.basic.SimplePage_3" wicket:id="link">Link</a>
<![endif]-->
<!--[if IE]>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html
index 1637ab2..dd2009d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html
@@ -11,7 +11,7 @@
<input type="image" src="../../test.gif">test 2</input>
<input type="image" src="../../test.gif" wicket:message="attr-name:i18n-key" attr-name="my i18n key">test 2</input>
- <wicket:message key="myKeyBalance">Your balance is <span wicket:id="amount">$5.00</span>. Click <a wicket:id="link" href="org.apache.wicket.markup.html.basic.SimplePage_3">
+ <wicket:message key="myKeyBalance">Your balance is <span wicket:id="amount">$5.00</span>. Click <a wicket:id="link" href="./org.apache.wicket.markup.html.basic.SimplePage_3">
<wicket:message key="linkText">here</wicket:message>
</a> to view the details.</wicket:message>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html
index 5757c31..7631045 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html
@@ -1,6 +1,6 @@
<html>
<body>
- <form wicket:id="form" id="form1" method="post" action="page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?0-1.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>
<select wicket:id="dropdown" name="dropdown">
<option selected="selected" value="0">A</option>
<option value="1">B</option>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html
index a1d6330..ab08e2d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html
@@ -1,6 +1,6 @@
<html>
<body>
- <form wicket:id="form" id="form1" method="post" action="page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?0-1.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>
<select wicket:id="dropdown" name="dropdown">
<option value=""></option>
<option selected="selected" value="0">A</option>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html
index ac19e89..daaf8c4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html
@@ -1,6 +1,6 @@
<html>
<body>
- <form wicket:id="form" id="form1" method="post" action="page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?0-1.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>
<select wicket:id="dropdown" name="dropdown">
<option selected="selected" value="">Choose One</option>
<option value="0">A</option>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html
index 4ee8981..7c87409 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html
@@ -1,6 +1,6 @@
<html>
<body>
- <form wicket:id="form" id="form1" method="post" action="page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?0-1.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>
<select wicket:id="dropdown" name="dropdown">
<option selected="selected" value=""></option>
<option value="0">A</option>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/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 51e4003..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="page?2-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?2-1.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/f1fa8377/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 1d142f0..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="page?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?1-1.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/f1fa8377/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 2b5c680..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="page?2-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?2-1.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/f1fa8377/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 b21c8d8..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,8 +1,8 @@
-<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>
- <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
-
- </form>
-</body>
-</html>
+<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>
+ <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
+
+ </form>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/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 4b7c444..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="page?5-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?5-1.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/f1fa8377/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 075749f..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="page?6-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?6-1.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/f1fa8377/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 f9bf81f..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="page?3-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?3-1.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/f1fa8377/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 e27d15e..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="page?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?1-1.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/f1fa8377/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 39063d3..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="page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?0-1.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/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
index 251018a..fcf1cad 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
@@ -3,33 +3,33 @@
<title>Mock Page</title>
</head>
<body>
-<a href="org.apache.wicket.markup.html.link.Page1">Home</a>
+<a href="./org.apache.wicket.markup.html.link.Page1">Home</a>
<wicket:link>
- <a href="org.apache.wicket.markup.html.link.Page1">Home</a>
+ <a href="./org.apache.wicket.markup.html.link.Page1">Home</a>
</wicket:link>
<wicket:link autolink="false">
<a href="../../Page1.html">Home</a>
</wicket:link>
<wicket:link autolink="true">
- <a href="org.apache.wicket.markup.html.link.Page1"><span wicket:id="myLabel">Home</span></a>
+ <a href="./org.apache.wicket.markup.html.link.Page1"><span wicket:id="myLabel">Home</span></a>
</wicket:link>
<wicket:link autolink="false">
<a href="../../Page1.html">Home</a>
<wicket:link autolink="true">
- <a href="org.apache.wicket.markup.html.link.Page1?id=123&name=test">Home</a>
+ <a href="./org.apache.wicket.markup.html.link.Page1?id=123&name=test">Home</a>
</wicket:link>
</wicket:link>
<!-- valid till the end of the document or the next link tag -->
<wicket:link autolink="false"/>
<a href="../../Page1.html">Home</a>
<wicket:link autolink="true">
-<a href="org.apache.wicket.markup.html.link.subdir.Page1">Home</a>
+<a href="./org.apache.wicket.markup.html.link.subdir.Page1">Home</a>
<link href="../resource/org.apache.wicket.markup.html.link.AutolinkPage_1/test.css"/>
<link href="../resource/org.apache.wicket.markup.html.link.AutolinkPage_1/test2.css?-myStyle"/>
<link href="../resource/org.apache.wicket.markup.html.link.AutolinkPage_1/test3.css?de_DE"/>
<link href="../resource/org.apache.wicket.markup.html.link.AutolinkPage_1/$up$/$up$/html/link/test2.css?-myStyle"/>
<a href="/root/test.html">Home</a>
-<a href="org.apache.wicket.markup.html.link.Page1">Home</a>
+<a href="./org.apache.wicket.markup.html.link.Page1">Home</a>
<a href="http://www.google.com">Google</a>
</wicket:link>
</body>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html
index 5c1ea5f..8be4563 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html
@@ -3,30 +3,30 @@
<title>Mock Page</title>
</head>
<body>
-<a href="org.apache.wicket.markup.html.link.Page1">Home</a>
+<a href="./org.apache.wicket.markup.html.link.Page1">Home</a>
- <a href="org.apache.wicket.markup.html.link.Page1">Home</a>
+ <a href="./org.apache.wicket.markup.html.link.Page1">Home</a>
<a href="../../Page1.html">Home</a>
- <a href="org.apache.wicket.markup.html.link.Page1"><span>Home</span></a>
+ <a href="./org.apache.wicket.markup.html.link.Page1"><span>Home</span></a>
<a href="../../Page1.html">Home</a>
- <a href="org.apache.wicket.markup.html.link.Page1?id=123&name=test">Home</a>
+ <a href="./org.apache.wicket.markup.html.link.Page1?id=123&name=test">Home</a>
<!-- valid till the end of the document or the next link tag -->
<a href="../../Page1.html">Home</a>
-<a href="org.apache.wicket.markup.html.link.subdir.Page1">Home</a>
+<a href="./org.apache.wicket.markup.html.link.subdir.Page1">Home</a>
<link href="../resource/org.apache.wicket.markup.html.link.AutolinkPage_2/test.css"/>
<a href="/root/test.html">Home</a>
-<a href="org.apache.wicket.markup.html.link.Page1">Home</a>
+<a href="./org.apache.wicket.markup.html.link.Page1">Home</a>
<a href="http://www.google.com">Google</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_3.html
index aa087f4..537e845 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_3.html
@@ -1,7 +1,7 @@
<html xmlns:wicket>
<body>
<wicket:link autolink="true">
- <a href="org.apache.wicket.markup.html.link.XmlPage">Home</a>
+ <a href="./org.apache.wicket.markup.html.link.XmlPage">Home</a>
</wicket:link>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_4.html
index 0ef9a4d..c5d240a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_4.html
@@ -7,7 +7,7 @@
<a href="#link1">Link 1</a>
<a href="">Link 1</a>
<!-- Supported since 1.2 -->
- <a href="org.apache.wicket.markup.html.link.Page1#link1">Link 1</a>
+ <a href="./org.apache.wicket.markup.html.link.Page1#link1">Link 1</a>
</wicket:link>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
index a6023b2..f0412ef 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
@@ -81,7 +81,7 @@ public class BookmarkablePageLinkTest extends WicketTestCase
tester.startComponentInPage(link, null);
String response = tester.getLastResponse().getDocument();
Assert.assertEquals(
- "<html><body><span wicket:id=\"link\" onclick=\"var win = this.ownerDocument.defaultView || this.ownerDocument.parentWindow; if (win == window) { window.location.href='bookmarkable/org.apache.wicket.MockPageWithLink?urlEscapeNeeded=someone%27s+%5Eb%25a%26d+pa%22rameter'; } ;return false\"></span></body></html>",
+ "<html><body><span wicket:id=\"link\" onclick=\"var win = this.ownerDocument.defaultView || this.ownerDocument.parentWindow; if (win == window) { window.location.href='./bookmarkable/org.apache.wicket.MockPageWithLink?urlEscapeNeeded=someone%27s+%5Eb%25a%26d+pa%22rameter'; } ;return false\"></span></body></html>",
response);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/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 a447216..03c54e8 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
@@ -85,7 +85,7 @@ public class MountedPageLinkTest extends WicketTestCase
new PageParameters().add("param", "value"));
Link<?> link = (Link<?>)page.get("link");
String url = link.getURL().toString();
- assertEquals("wicket/page?0-1.ILinkListener-link", url);
+ assertEquals("./wicket/page?0-1.ILinkListener-link", url);
tester.executeUrl(url);
}
@@ -100,7 +100,7 @@ public class MountedPageLinkTest extends WicketTestCase
new PageParameters().add("param", "value"));
Link<?> link = (Link<?>)page.get("link");
String url = link.getURL().toString();
- assertEquals("wicket/page?0-1.ILinkListener-link", url);
+ assertEquals("./wicket/page?0-1.ILinkListener-link", url);
// simulate a page expiry
url = url.replace("page?0", "page?3");
tester.executeUrl(url);
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2.html
index 50225b7..8fc9b60 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
-<wicket:message key="myKey">Your balance is $5.00. Click <a wicket:id="link" href="org.apache.wicket.markup.resolver.SimplePage_1">
+<wicket:message key="myKey">Your balance is $5.00. Click <a wicket:id="link" href="./org.apache.wicket.markup.resolver.SimplePage_1">
<wicket:message key="linkText">here</wicket:message>
</a> to view the details.</wicket:message>
</body>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2a.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2a.html b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2a.html
index 54b8260..d5821b9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2a.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2a.html
@@ -1,6 +1,6 @@
<html>
<body>
-Your balance is $5.00. Click <a href="org.apache.wicket.markup.resolver.SimplePage_1">
+Your balance is $5.00. Click <a href="./org.apache.wicket.markup.resolver.SimplePage_1">
here
</a> to view the details.
</body>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
index 4a3f6f7..e97113dd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
@@ -33,8 +33,8 @@ public class UrlRendererTest extends TestCase
public void test1()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("foo/bar/baz?a=b")));
- assertEquals("xyz?x=y", r1.renderUrl(Url.parse("foo/bar/xyz?x=y")));
- assertEquals("baz/xyz?x=y", r1.renderUrl(Url.parse("foo/bar/baz/xyz?x=y")));
+ assertEquals("./xyz?x=y", r1.renderUrl(Url.parse("foo/bar/xyz?x=y")));
+ assertEquals("./baz/xyz?x=y", r1.renderUrl(Url.parse("foo/bar/baz/xyz?x=y")));
assertEquals("../aaa/xyz?x=y", r1.renderUrl(Url.parse("foo/aaa/xyz?x=y")));
assertEquals("../../bbb/aaa/xyz?x=y", r1.renderUrl(Url.parse("bbb/aaa/xyz?x=y")));
}
@@ -55,7 +55,7 @@ public class UrlRendererTest extends TestCase
public void test3()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("?a=b")));
- assertEquals("a/b/c?x=y", r1.renderUrl(Url.parse("a/b/c?x=y")));
+ assertEquals("./a/b/c?x=y", r1.renderUrl(Url.parse("a/b/c?x=y")));
}
/**
@@ -64,7 +64,7 @@ public class UrlRendererTest extends TestCase
public void test5()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("url")));
- assertEquals("url?1", r1.renderUrl(Url.parse("url?1")));
+ assertEquals("./url?1", r1.renderUrl(Url.parse("url?1")));
}
/**
@@ -73,7 +73,7 @@ public class UrlRendererTest extends TestCase
public void test6()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("url/")));
- assertEquals("x?1", r1.renderUrl(Url.parse("url/x?1")));
+ assertEquals("./x?1", r1.renderUrl(Url.parse("url/x?1")));
}
/**
@@ -93,7 +93,7 @@ public class UrlRendererTest extends TestCase
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(
Url.parse("en/first-test-page?16-1.ILinkListener-l1")));
- assertEquals("first-test-page/indexed1/indexed2/indexed3?p1=v1",
+ assertEquals("./first-test-page/indexed1/indexed2/indexed3?p1=v1",
r1.renderUrl(Url.parse("en/first-test-page/indexed1/indexed2/indexed3?p1=v1")));
}
@@ -137,7 +137,7 @@ public class UrlRendererTest extends TestCase
public void test11()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("a")));
- assertEquals(".", r1.renderUrl(Url.parse("")));
+ assertEquals("./.", r1.renderUrl(Url.parse("")));
}
/**
@@ -146,14 +146,14 @@ public class UrlRendererTest extends TestCase
public void test12()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("?0")));
- assertEquals(".", r1.renderUrl(Url.parse("")));
+ assertEquals("./", r1.renderUrl(Url.parse("")));
}
/**
* https://issues.apache.org/jira/browse/WICKET-4401
- *
- * A Url should not ends with '..' because some web containers do not handle it
- * properly. Using '../' works better.
+ *
+ * A Url should not end with '..' because some web containers do not handle it properly. Using
+ * '../' works better.
*/
public void test13()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
index 5ebc2c4..9de028d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="testValue2?0-1.ILinkListener-link" wicket:id="link">test</a>
+<a href="./testValue2?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/f1fa8377/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
index 82019f3..9455517 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="stateless?0-1.ILinkListener-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a>
+<a href="./stateless?0-1.ILinkListener-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
index 64d608e..75f0e6a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="org.apache.wicket.stateless.StatelessComponentPageWithParams?0-1.ILinkListener-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a>
+<a href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?0-1.ILinkListener-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
index 382e383..7ba54a7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="stateless?0-1.ILinkListener-link" wicket:id="link">test</a>
+<a href="./stateless?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/f1fa8377/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
index 94f3210..ddd737e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="org.apache.wicket.stateless.StatelessComponentPage?0-1.ILinkListener-link" wicket:id="link">test</a>
+<a href="./org.apache.wicket.stateless.StatelessComponentPage?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/f1fa8377/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
index a3ab72b..9992dbe 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
@@ -1,5 +1,5 @@
<html>
<body>
-<form wicket:id="form" id="form1" method="post" action="org.apache.wicket.stateless.StatelessPageWithForm?0-1.IFormSubmitListener-form&first=foo&second=bar"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div></form>
+<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.stateless.StatelessPageWithForm?0-1.IFormSubmitListener-form&first=foo&second=bar"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div></form>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/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 04e8d3a..a9e4b32 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
@@ -103,7 +103,7 @@ wicketCalendarAdd(function() {
</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">
+<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">Chinesisch (China) (Chinese (China))</option>
<option value="1">Chinesisch (China) (Chinese (China))</option>
<option value="2">Chinesisch (China) (Chinese (China))</option>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
index 5a2d852..8aeed10 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
@@ -51,7 +51,7 @@ public class AjaxLazyLoadPanelTesterTest extends WicketTestCase
tester.startComponentInPage(panel);
tester.assertLabel(
"panel:content",
- "<img alt=\"Loading...\" src=\"resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/indicator.gif\"/>");
+ "<img alt=\"Loading...\" src=\"./resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/indicator.gif\"/>");
AjaxLazyLoadPanelTester.executeAjaxLazyLoadPanel(tester, panel.getParent());
tester.debugComponentTrees();
tester.assertLabel("panel:content", "lazy panel test");
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1fa8377/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java b/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
index f762aef..05111f4 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
@@ -233,21 +233,17 @@ public class UrlRenderer
newSegments.addAll(urlSegments);
String renderedUrl = new Url(newSegments, url.getQueryParameters()).toString();
- String result;
- if (Strings.isEmpty(renderedUrl))
+ if (!renderedUrl.startsWith(".."))
{
- result = ".";
+ // WICKET-4260
+ renderedUrl = "./" + renderedUrl;
}
- else if (renderedUrl.endsWith(".."))
+ if (renderedUrl.endsWith(".."))
{
// WICKET-4401
- result = renderedUrl + '/';
+ renderedUrl = renderedUrl + '/';
}
- else
- {
- result = renderedUrl;
- }
- return result;
+ return renderedUrl;
}
}