[05/21] git commit: WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d3d42d42
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d3d42d42
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d3d42d42
Branch: refs/heads/master
Commit: d3d42d42c5b71a2792c876498aaa898be94f67d4
Parents: f38d32e
Author: Martin Tzvetanov Grigorov mgrigo...@apache.org
Authored: Mon Jun 17 10:40:48 2013 +0200
Committer: Martin Tzvetanov Grigorov mgrigo...@apache.org
Committed: Mon Jun 17 10:41:17 2013 +0200
--
.../core/request/mapper/BookmarkableMapper.java | 5 ++
.../core/request/mapper/PageInstanceMapper.java | 6 ++-
.../request/mapper/BookmarkableMapperTest.java | 56
3 files changed, 65 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/d3d42d42/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
index 1fd71d6..a9fd212 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
@@ -190,6 +190,11 @@ public class BookmarkableMapper extends
AbstractBookmarkableMapper
{
matches = true;
}
+ // baseUrl = 'bookmarkable/com.example.SomePage', requestUrl =
'bookmarkable/com.example.SomePage'
+ else if (baseUrl.getSegments().size() == 2
urlStartsWith(baseUrl, bookmarkableIdentifier) url.getSegments().size() == 2
urlStartsWith(url, bookmarkableIdentifier))
+ {
+ matches = true;
+ }
// baseUrl = 'wicket/page[?...]', requestUrl =
'bookmarkable/com.example.SomePage'
else if (baseUrl.getSegments().size() == 2
urlStartsWith(baseUrl, namespace, pageIdentifier) url.getSegments().size()
= 2 urlStartsWith(url, bookmarkableIdentifier))
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/d3d42d42/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
index 3789a9f..a034642 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
@@ -175,17 +175,19 @@ public class PageInstanceMapper extends
AbstractComponentMapper
{
boolean matches = false;
Url url = request.getUrl();
+ Url baseUrl = request.getClientUrl();
String namespace = getContext().getNamespace();
String pageIdentifier = getContext().getPageIdentifier();
+
if (urlStartsWith(url, namespace, pageIdentifier))
{
matches = true;
}
- else if (urlStartsWith(request.getClientUrl(), namespace,
pageIdentifier) urlStartsWith(url, pageIdentifier))
+ else if (urlStartsWith(baseUrl, namespace, pageIdentifier)
urlStartsWith(url, pageIdentifier))
{
matches = true;
}
- else if (urlStartsWith(request.getClientUrl(), pageIdentifier)
urlStartsWith(url, pageIdentifier))
+ else if (urlStartsWith(baseUrl, pageIdentifier)
urlStartsWith(url, pageIdentifier))
{
matches = true;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d3d42d42/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 874a525..4b71b65 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
@@ -357,6 +357,62 @@ public class BookmarkableMapperTest extends
AbstractMapperTest
}
git commit: WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Updated Branches:
refs/heads/wicket-6.x eb6ee7eda - 5ada2c75c
WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5ada2c75
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5ada2c75
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5ada2c75
Branch: refs/heads/wicket-6.x
Commit: 5ada2c75c36058e99fae55fd97d7d6957f8e2b53
Parents: eb6ee7e
Author: Martin Tzvetanov Grigorov mgrigo...@apache.org
Authored: Mon Jun 17 10:40:48 2013 +0200
Committer: Martin Tzvetanov Grigorov mgrigo...@apache.org
Committed: Mon Jun 17 10:40:48 2013 +0200
--
.../core/request/mapper/BookmarkableMapper.java | 5 ++
.../core/request/mapper/PageInstanceMapper.java | 6 ++-
.../request/mapper/BookmarkableMapperTest.java | 56
3 files changed, 65 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/5ada2c75/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
index 1fd71d6..a9fd212 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
@@ -190,6 +190,11 @@ public class BookmarkableMapper extends
AbstractBookmarkableMapper
{
matches = true;
}
+ // baseUrl = 'bookmarkable/com.example.SomePage', requestUrl =
'bookmarkable/com.example.SomePage'
+ else if (baseUrl.getSegments().size() == 2
urlStartsWith(baseUrl, bookmarkableIdentifier) url.getSegments().size() == 2
urlStartsWith(url, bookmarkableIdentifier))
+ {
+ matches = true;
+ }
// baseUrl = 'wicket/page[?...]', requestUrl =
'bookmarkable/com.example.SomePage'
else if (baseUrl.getSegments().size() == 2
urlStartsWith(baseUrl, namespace, pageIdentifier) url.getSegments().size()
= 2 urlStartsWith(url, bookmarkableIdentifier))
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/5ada2c75/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
index 3789a9f..a034642 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
@@ -175,17 +175,19 @@ public class PageInstanceMapper extends
AbstractComponentMapper
{
boolean matches = false;
Url url = request.getUrl();
+ Url baseUrl = request.getClientUrl();
String namespace = getContext().getNamespace();
String pageIdentifier = getContext().getPageIdentifier();
+
if (urlStartsWith(url, namespace, pageIdentifier))
{
matches = true;
}
- else if (urlStartsWith(request.getClientUrl(), namespace,
pageIdentifier) urlStartsWith(url, pageIdentifier))
+ else if (urlStartsWith(baseUrl, namespace, pageIdentifier)
urlStartsWith(url, pageIdentifier))
{
matches = true;
}
- else if (urlStartsWith(request.getClientUrl(), pageIdentifier)
urlStartsWith(url, pageIdentifier))
+ else if (urlStartsWith(baseUrl, pageIdentifier)
urlStartsWith(url, pageIdentifier))
{
matches = true;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/5ada2c75/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 874a525..4b71b65 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
@@ -357,6 +357,62 @@ public
git commit: WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Updated Branches:
refs/heads/master 4bc20743f - faaae8d33
WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/faaae8d3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/faaae8d3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/faaae8d3
Branch: refs/heads/master
Commit: faaae8d330a8e1c386f8c87de73db9451828b64b
Parents: 4bc2074
Author: Martin Tzvetanov Grigorov mgrigo...@apache.org
Authored: Mon Jun 17 10:40:48 2013 +0200
Committer: Martin Tzvetanov Grigorov mgrigo...@apache.org
Committed: Mon Jun 17 10:42:32 2013 +0200
--
.../core/request/mapper/BookmarkableMapper.java | 5 ++
.../core/request/mapper/PageInstanceMapper.java | 6 ++-
.../request/mapper/BookmarkableMapperTest.java | 56
3 files changed, 65 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/faaae8d3/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
index 1fd71d6..a9fd212 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
@@ -190,6 +190,11 @@ public class BookmarkableMapper extends
AbstractBookmarkableMapper
{
matches = true;
}
+ // baseUrl = 'bookmarkable/com.example.SomePage', requestUrl =
'bookmarkable/com.example.SomePage'
+ else if (baseUrl.getSegments().size() == 2
urlStartsWith(baseUrl, bookmarkableIdentifier) url.getSegments().size() == 2
urlStartsWith(url, bookmarkableIdentifier))
+ {
+ matches = true;
+ }
// baseUrl = 'wicket/page[?...]', requestUrl =
'bookmarkable/com.example.SomePage'
else if (baseUrl.getSegments().size() == 2
urlStartsWith(baseUrl, namespace, pageIdentifier) url.getSegments().size()
= 2 urlStartsWith(url, bookmarkableIdentifier))
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/faaae8d3/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
index 3789a9f..a034642 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
@@ -175,17 +175,19 @@ public class PageInstanceMapper extends
AbstractComponentMapper
{
boolean matches = false;
Url url = request.getUrl();
+ Url baseUrl = request.getClientUrl();
String namespace = getContext().getNamespace();
String pageIdentifier = getContext().getPageIdentifier();
+
if (urlStartsWith(url, namespace, pageIdentifier))
{
matches = true;
}
- else if (urlStartsWith(request.getClientUrl(), namespace,
pageIdentifier) urlStartsWith(url, pageIdentifier))
+ else if (urlStartsWith(baseUrl, namespace, pageIdentifier)
urlStartsWith(url, pageIdentifier))
{
matches = true;
}
- else if (urlStartsWith(request.getClientUrl(), pageIdentifier)
urlStartsWith(url, pageIdentifier))
+ else if (urlStartsWith(baseUrl, pageIdentifier)
urlStartsWith(url, pageIdentifier))
{
matches = true;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/faaae8d3/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 874a525..4b71b65 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
@@ -357,6 +357,62 @@ public class
[5/8] git commit: WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d3d42d42
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d3d42d42
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d3d42d42
Branch: refs/heads/wicket-examples-gym-tests
Commit: d3d42d42c5b71a2792c876498aaa898be94f67d4
Parents: f38d32e
Author: Martin Tzvetanov Grigorov mgrigo...@apache.org
Authored: Mon Jun 17 10:40:48 2013 +0200
Committer: Martin Tzvetanov Grigorov mgrigo...@apache.org
Committed: Mon Jun 17 10:41:17 2013 +0200
--
.../core/request/mapper/BookmarkableMapper.java | 5 ++
.../core/request/mapper/PageInstanceMapper.java | 6 ++-
.../request/mapper/BookmarkableMapperTest.java | 56
3 files changed, 65 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/d3d42d42/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
index 1fd71d6..a9fd212 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
@@ -190,6 +190,11 @@ public class BookmarkableMapper extends
AbstractBookmarkableMapper
{
matches = true;
}
+ // baseUrl = 'bookmarkable/com.example.SomePage', requestUrl =
'bookmarkable/com.example.SomePage'
+ else if (baseUrl.getSegments().size() == 2
urlStartsWith(baseUrl, bookmarkableIdentifier) url.getSegments().size() == 2
urlStartsWith(url, bookmarkableIdentifier))
+ {
+ matches = true;
+ }
// baseUrl = 'wicket/page[?...]', requestUrl =
'bookmarkable/com.example.SomePage'
else if (baseUrl.getSegments().size() == 2
urlStartsWith(baseUrl, namespace, pageIdentifier) url.getSegments().size()
= 2 urlStartsWith(url, bookmarkableIdentifier))
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/d3d42d42/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
index 3789a9f..a034642 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
@@ -175,17 +175,19 @@ public class PageInstanceMapper extends
AbstractComponentMapper
{
boolean matches = false;
Url url = request.getUrl();
+ Url baseUrl = request.getClientUrl();
String namespace = getContext().getNamespace();
String pageIdentifier = getContext().getPageIdentifier();
+
if (urlStartsWith(url, namespace, pageIdentifier))
{
matches = true;
}
- else if (urlStartsWith(request.getClientUrl(), namespace,
pageIdentifier) urlStartsWith(url, pageIdentifier))
+ else if (urlStartsWith(baseUrl, namespace, pageIdentifier)
urlStartsWith(url, pageIdentifier))
{
matches = true;
}
- else if (urlStartsWith(request.getClientUrl(), pageIdentifier)
urlStartsWith(url, pageIdentifier))
+ else if (urlStartsWith(baseUrl, pageIdentifier)
urlStartsWith(url, pageIdentifier))
{
matches = true;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d3d42d42/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 874a525..4b71b65 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
@@ -357,6 +357,62 @@ public class BookmarkableMapperTest extends
git commit: WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Updated Branches:
refs/heads/master 4b37aaf88 - b5cb9887f
WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
PageInstanceMapper now will match if the baseUrl is 'page?..' and the request
url is 'page?...'
An explicit mount of a page at 'page' will have higher priority because it is
added later in CompoundRequestMapper
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b5cb9887
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b5cb9887
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b5cb9887
Branch: refs/heads/master
Commit: b5cb9887fecad4815849eca22441521ee35669e1
Parents: 4b37aaf
Author: Martin Tzvetanov Grigorov mgrigo...@apache.org
Authored: Fri Jun 14 16:33:17 2013 +0300
Committer: Martin Tzvetanov Grigorov mgrigo...@apache.org
Committed: Fri Jun 14 16:33:17 2013 +0300
--
.../core/request/mapper/PageInstanceMapper.java | 4 ++
.../request/mapper/PageInstanceMapperTest.java | 49 +++-
.../ajax/markup/html/modal/ModalWindow.java | 7 +--
.../ajax/markup/html/modal/res/modal.js | 6 +--
4 files changed, 54 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/b5cb9887/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
index 9f75813..3789a9f 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
@@ -185,6 +185,10 @@ public class PageInstanceMapper extends
AbstractComponentMapper
{
matches = true;
}
+ else if (urlStartsWith(request.getClientUrl(), pageIdentifier)
urlStartsWith(url, pageIdentifier))
+ {
+ matches = true;
+ }
return matches;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/b5cb9887/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
--
diff --git
a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
index a112640..d1fa307 100644
---
a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
+++
b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
@@ -31,6 +31,7 @@ import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestableComponent;
+import org.apache.wicket.request.component.IRequestablePage;
import org.junit.Test;
/**
@@ -211,7 +212,53 @@ public class PageInstanceMapperTest extends
AbstractMapperTest
IRequestHandler handler = encoder.mapRequest(request);
- ((IPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((IPageRequestHandler)
handler).getPage();
+ checkPage(page, 4);
+ }
+
+
+ @Test
+ public void decode10()
+ {
+ final Url url = Url.parse(page?4);
+
+ Request request = new Request()
+ {
+ @Override
+ public Url getUrl()
+ {
+ return url;
+ }
+
+ @Override
+ public Locale getLocale()
+ {
+ return null;
+ }
+
+ @Override
+ public Charset getCharset()
+ {
+ return Charset.forName(UTF-8);
+ }
+
+ @Override
+ public Url getClientUrl()
+ {
+ return Url.parse(page);
+ }
+
+ @Override
+ public Object getContainerRequest()
+ {
+ return null;
+ }
+ };
+
+ IRequestHandler handler = encoder.mapRequest(request);
+
+ IRequestablePage page = ((IPageRequestHandler)
handler).getPage();
+
git commit: WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Updated Branches:
refs/heads/wicket-6.x 2468536a3 - 432310bda
WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
PageInstanceMapper now will match if the baseUrl is 'page?..' and the request
url is 'page?...'
An explicit mount of a page at 'page' will have higher priority because it is
added later in CompoundRequestMapper
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/432310bd
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/432310bd
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/432310bd
Branch: refs/heads/wicket-6.x
Commit: 432310bdae50498419ff84031430d02ba36d346d
Parents: 2468536
Author: Martin Tzvetanov Grigorov mgrigo...@apache.org
Authored: Fri Jun 14 16:33:17 2013 +0300
Committer: Martin Tzvetanov Grigorov mgrigo...@apache.org
Committed: Fri Jun 14 16:35:09 2013 +0300
--
.../core/request/mapper/PageInstanceMapper.java | 4 ++
.../request/mapper/PageInstanceMapperTest.java | 49 +++-
.../ajax/markup/html/modal/ModalWindow.java | 7 +--
.../ajax/markup/html/modal/res/modal.js | 6 +--
4 files changed, 54 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/432310bd/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
index 9f75813..3789a9f 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
@@ -185,6 +185,10 @@ public class PageInstanceMapper extends
AbstractComponentMapper
{
matches = true;
}
+ else if (urlStartsWith(request.getClientUrl(), pageIdentifier)
urlStartsWith(url, pageIdentifier))
+ {
+ matches = true;
+ }
return matches;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/432310bd/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
--
diff --git
a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
index a112640..d1fa307 100644
---
a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
+++
b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
@@ -31,6 +31,7 @@ import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestableComponent;
+import org.apache.wicket.request.component.IRequestablePage;
import org.junit.Test;
/**
@@ -211,7 +212,53 @@ public class PageInstanceMapperTest extends
AbstractMapperTest
IRequestHandler handler = encoder.mapRequest(request);
- ((IPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((IPageRequestHandler)
handler).getPage();
+ checkPage(page, 4);
+ }
+
+
+ @Test
+ public void decode10()
+ {
+ final Url url = Url.parse(page?4);
+
+ Request request = new Request()
+ {
+ @Override
+ public Url getUrl()
+ {
+ return url;
+ }
+
+ @Override
+ public Locale getLocale()
+ {
+ return null;
+ }
+
+ @Override
+ public Charset getCharset()
+ {
+ return Charset.forName(UTF-8);
+ }
+
+ @Override
+ public Url getClientUrl()
+ {
+ return Url.parse(page);
+ }
+
+ @Override
+ public Object getContainerRequest()
+ {
+ return null;
+ }
+ };
+
+ IRequestHandler handler = encoder.mapRequest(request);
+
+ IRequestablePage page = ((IPageRequestHandler)
handler).getPage();
+
git commit: WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Updated Branches:
refs/heads/wicket-6.x 3464d733f - 31dde2838
WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/31dde283
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/31dde283
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/31dde283
Branch: refs/heads/wicket-6.x
Commit: 31dde28388a0fd8df3ab455a9485854b85d09b5f
Parents: 3464d73
Author: Martin Tzvetanov Grigorov mgrigo...@apache.org
Authored: Tue May 14 11:51:10 2013 +0300
Committer: Martin Tzvetanov Grigorov mgrigo...@apache.org
Committed: Tue May 14 11:51:10 2013 +0300
--
.../core/request/mapper/BookmarkableMapper.java| 54 +-
.../request/mapper/BookmarkableMapperTest.java | 129 ++-
2 files changed, 168 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/31dde283/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
index b1418bf..1fd71d6 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.core.request.mapper;
+import java.util.List;
+
import org.apache.wicket.Application;
import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
@@ -93,14 +95,26 @@ public class BookmarkableMapper extends
AbstractBookmarkableMapper
@Override
protected UrlInfo parseRequest(Request request)
{
- Url url = request.getUrl();
- if (matches(url))
+ if (matches(request))
{
+ Url url = request.getUrl();
+
// try to extract page and component information from
URL
PageComponentInfo info = getPageComponentInfo(url);
+ ListString segments = url.getSegments();
+
// load the page class
- String className = url.getSegments().get(2);
+ String className;
+ if (segments.size() = 3)
+ {
+ className = segments.get(2);
+ }
+ else
+ {
+ className = segments.get(1);
+ }
+
Class? extends IRequestablePage pageClass =
getPageClass(className);
if (pageClass != null
IRequestablePage.class.isAssignableFrom(pageClass))
@@ -111,13 +125,13 @@ public class BookmarkableMapper extends
AbstractBookmarkableMapper
if
(application.getSecuritySettings().getEnforceMounts())
{
- // we make an excepion if the
homepage itself was mounted, see WICKET-1898
+ // we make an exception if the
homepage itself was mounted, see WICKET-1898
if
(!pageClass.equals(application.getHomePage()))
{
// WICKET-5094 only
enforce mount if page is mounted
Url reverseUrl =
application.getRootRequestMapper().mapHandler(
new
RenderPageRequestHandler(new PageProvider(pageClass)));
- if
(!matches(reverseUrl))
+ if
(!matches(request.cloneWithUrl(reverseUrl)))
{
return null;
}
@@ -151,17 +165,37 @@ public class BookmarkableMapper extends
AbstractBookmarkableMapper
public int getCompatibilityScore(Request request)
{
int score = 0;
- Url url = request.getUrl();
- if (matches(url))
+ if (matches(request))
{
score = Integer.MAX_VALUE;
}
return score;
}
- private
git commit: WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Updated Branches:
refs/heads/master 7a0bb33e5 - 6e794ad06
WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6e794ad0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6e794ad0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6e794ad0
Branch: refs/heads/master
Commit: 6e794ad060af7512a6f0e9a0d445037047aad0e1
Parents: 7a0bb33
Author: Martin Tzvetanov Grigorov mgrigo...@apache.org
Authored: Tue May 14 11:51:10 2013 +0300
Committer: Martin Tzvetanov Grigorov mgrigo...@apache.org
Committed: Tue May 14 11:51:35 2013 +0300
--
.../core/request/mapper/BookmarkableMapper.java| 54 +-
.../request/mapper/BookmarkableMapperTest.java | 129 ++-
2 files changed, 168 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/6e794ad0/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
index b1418bf..1fd71d6 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.core.request.mapper;
+import java.util.List;
+
import org.apache.wicket.Application;
import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
@@ -93,14 +95,26 @@ public class BookmarkableMapper extends
AbstractBookmarkableMapper
@Override
protected UrlInfo parseRequest(Request request)
{
- Url url = request.getUrl();
- if (matches(url))
+ if (matches(request))
{
+ Url url = request.getUrl();
+
// try to extract page and component information from
URL
PageComponentInfo info = getPageComponentInfo(url);
+ ListString segments = url.getSegments();
+
// load the page class
- String className = url.getSegments().get(2);
+ String className;
+ if (segments.size() = 3)
+ {
+ className = segments.get(2);
+ }
+ else
+ {
+ className = segments.get(1);
+ }
+
Class? extends IRequestablePage pageClass =
getPageClass(className);
if (pageClass != null
IRequestablePage.class.isAssignableFrom(pageClass))
@@ -111,13 +125,13 @@ public class BookmarkableMapper extends
AbstractBookmarkableMapper
if
(application.getSecuritySettings().getEnforceMounts())
{
- // we make an excepion if the
homepage itself was mounted, see WICKET-1898
+ // we make an exception if the
homepage itself was mounted, see WICKET-1898
if
(!pageClass.equals(application.getHomePage()))
{
// WICKET-5094 only
enforce mount if page is mounted
Url reverseUrl =
application.getRootRequestMapper().mapHandler(
new
RenderPageRequestHandler(new PageProvider(pageClass)));
- if
(!matches(reverseUrl))
+ if
(!matches(request.cloneWithUrl(reverseUrl)))
{
return null;
}
@@ -151,17 +165,37 @@ public class BookmarkableMapper extends
AbstractBookmarkableMapper
public int getCompatibilityScore(Request request)
{
int score = 0;
- Url url = request.getUrl();
- if (matches(url))
+ if (matches(request))
{
score = Integer.MAX_VALUE;
}
return score;
}
- private boolean
git commit: WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Updated Branches:
refs/heads/master 6eec04b13 - a2f848f25
WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Extend PageInstanceMapper to match when the request is to 'page?...' and the
baseUrl is 'wicket/page?...'
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a2f848f2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a2f848f2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a2f848f2
Branch: refs/heads/master
Commit: a2f848f250401fdcb5a0687a72ff856bdd196df8
Parents: 6eec04b
Author: Martin Tzvetanov Grigorov mgrigo...@apache.org
Authored: Mon May 13 17:02:06 2013 +0300
Committer: Martin Tzvetanov Grigorov mgrigo...@apache.org
Committed: Mon May 13 17:02:06 2013 +0300
--
.../core/request/mapper/PageInstanceMapper.java| 34 --
.../request/mapper/PageInstanceMapperTest.java | 55 +-
2 files changed, 79 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/a2f848f2/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
index 776e546..fb9b3bd 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
@@ -59,9 +59,9 @@ public class PageInstanceMapper extends
AbstractComponentMapper
@Override
public IRequestHandler mapRequest(Request request)
{
- Url url = request.getUrl();
- if (matches(url))
+ if (matches(request))
{
+ Url url = request.getUrl();
PageComponentInfo info = getPageComponentInfo(url);
if (info != null info.getPageInfo().getPageId() !=
null)
{
@@ -153,16 +153,38 @@ public class PageInstanceMapper extends
AbstractComponentMapper
public int getCompatibilityScore(final Request request)
{
int score = 0;
- Url url = request.getUrl();
- if (matches(url))
+ if (matches(request))
{
score = Integer.MAX_VALUE;
}
return score;
}
- private boolean matches(final Url url)
+ /**
+* Matches when the request url starts with
+* {@link
org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}/{@link
org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
+* or when the base url starts with {@link
org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}
+* and the request url with {@link
org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
+
+* @param request
+* the request to check
+* @return {@code true} if the conditions match
+*/
+ private boolean matches(final Request request)
{
- return urlStartsWith(url, getContext().getNamespace(),
getContext().getPageIdentifier());
+ boolean matches = false;
+ Url url = request.getUrl();
+ String namespace = getContext().getNamespace();
+ String pageIdentifier = getContext().getPageIdentifier();
+ if (urlStartsWith(url, namespace, pageIdentifier))
+ {
+ matches = true;
+ }
+ else if (urlStartsWith(request.getClientUrl(), namespace)
urlStartsWith(url, pageIdentifier))
+ {
+ matches = true;
+ }
+
+ return matches;
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/a2f848f2/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
--
diff --git
a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
index 089fc31..a112640 100644
---
a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
+++
b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
@@ -16,17 +16,21 @@
*/
package org.apache.wicket.core.request.mapper;
+import java.nio.charset.Charset;
+import java.util.Locale;
+
import org.apache.wicket.MockPage;
-import
git commit: WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Updated Branches:
refs/heads/master a2f848f25 - aa6b8729d
WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Make the check more strict. We can relax it later if needed.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/aa6b8729
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/aa6b8729
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/aa6b8729
Branch: refs/heads/master
Commit: aa6b8729d13a6074eb20be539ee8b661b2df19ee
Parents: a2f848f
Author: Martin Tzvetanov Grigorov mgrigo...@apache.org
Authored: Mon May 13 17:07:25 2013 +0300
Committer: Martin Tzvetanov Grigorov mgrigo...@apache.org
Committed: Mon May 13 17:07:25 2013 +0300
--
.../core/request/mapper/PageInstanceMapper.java|5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/aa6b8729/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
index fb9b3bd..9f75813 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
@@ -163,7 +163,8 @@ public class PageInstanceMapper extends
AbstractComponentMapper
/**
* Matches when the request url starts with
* {@link
org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}/{@link
org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
-* or when the base url starts with {@link
org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}
+* or when the base url starts with
+* {@link
org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}/{@link
org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
* and the request url with {@link
org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
* @param request
@@ -180,7 +181,7 @@ public class PageInstanceMapper extends
AbstractComponentMapper
{
matches = true;
}
- else if (urlStartsWith(request.getClientUrl(), namespace)
urlStartsWith(url, pageIdentifier))
+ else if (urlStartsWith(request.getClientUrl(), namespace,
pageIdentifier) urlStartsWith(url, pageIdentifier))
{
matches = true;
}
[1/3] git commit: WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Updated Branches:
refs/heads/wicket-6.x 8b4532b31 - d0e233553
WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Extend PageInstanceMapper to match when the request is to 'page?...' and the
baseUrl is 'wicket/page?...'
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/25df9fa4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/25df9fa4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/25df9fa4
Branch: refs/heads/wicket-6.x
Commit: 25df9fa4cc4289b8136a896e11c65afd4a4eb6cf
Parents: 8b4532b
Author: Martin Tzvetanov Grigorov mgrigo...@apache.org
Authored: Mon May 13 17:02:06 2013 +0300
Committer: Martin Tzvetanov Grigorov mgrigo...@apache.org
Committed: Mon May 13 17:03:12 2013 +0300
--
.../core/request/mapper/PageInstanceMapper.java| 34 --
.../request/mapper/PageInstanceMapperTest.java | 55 +-
2 files changed, 79 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/25df9fa4/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
index 776e546..fb9b3bd 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
@@ -59,9 +59,9 @@ public class PageInstanceMapper extends
AbstractComponentMapper
@Override
public IRequestHandler mapRequest(Request request)
{
- Url url = request.getUrl();
- if (matches(url))
+ if (matches(request))
{
+ Url url = request.getUrl();
PageComponentInfo info = getPageComponentInfo(url);
if (info != null info.getPageInfo().getPageId() !=
null)
{
@@ -153,16 +153,38 @@ public class PageInstanceMapper extends
AbstractComponentMapper
public int getCompatibilityScore(final Request request)
{
int score = 0;
- Url url = request.getUrl();
- if (matches(url))
+ if (matches(request))
{
score = Integer.MAX_VALUE;
}
return score;
}
- private boolean matches(final Url url)
+ /**
+* Matches when the request url starts with
+* {@link
org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}/{@link
org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
+* or when the base url starts with {@link
org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}
+* and the request url with {@link
org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
+
+* @param request
+* the request to check
+* @return {@code true} if the conditions match
+*/
+ private boolean matches(final Request request)
{
- return urlStartsWith(url, getContext().getNamespace(),
getContext().getPageIdentifier());
+ boolean matches = false;
+ Url url = request.getUrl();
+ String namespace = getContext().getNamespace();
+ String pageIdentifier = getContext().getPageIdentifier();
+ if (urlStartsWith(url, namespace, pageIdentifier))
+ {
+ matches = true;
+ }
+ else if (urlStartsWith(request.getClientUrl(), namespace)
urlStartsWith(url, pageIdentifier))
+ {
+ matches = true;
+ }
+
+ return matches;
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/25df9fa4/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
--
diff --git
a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
index 089fc31..a112640 100644
---
a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
+++
b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
@@ -16,17 +16,21 @@
*/
package org.apache.wicket.core.request.mapper;
+import java.nio.charset.Charset;
+import java.util.Locale;
+
import org.apache.wicket.MockPage;
[2/3] git commit: WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
WICKET-5071 404 Error on Nested ModalWindows in IE7 and IE8
Make the check more strict. We can relax it later if needed.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3e51cca9
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3e51cca9
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3e51cca9
Branch: refs/heads/wicket-6.x
Commit: 3e51cca909c7179ca0548c2043b3ec89745c45ed
Parents: 25df9fa
Author: Martin Tzvetanov Grigorov mgrigo...@apache.org
Authored: Mon May 13 17:07:25 2013 +0300
Committer: Martin Tzvetanov Grigorov mgrigo...@apache.org
Committed: Mon May 13 17:08:10 2013 +0300
--
.../core/request/mapper/PageInstanceMapper.java|5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e51cca9/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
index fb9b3bd..9f75813 100644
---
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
+++
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
@@ -163,7 +163,8 @@ public class PageInstanceMapper extends
AbstractComponentMapper
/**
* Matches when the request url starts with
* {@link
org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}/{@link
org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
-* or when the base url starts with {@link
org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}
+* or when the base url starts with
+* {@link
org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}/{@link
org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
* and the request url with {@link
org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
* @param request
@@ -180,7 +181,7 @@ public class PageInstanceMapper extends
AbstractComponentMapper
{
matches = true;
}
- else if (urlStartsWith(request.getClientUrl(), namespace)
urlStartsWith(url, pageIdentifier))
+ else if (urlStartsWith(request.getClientUrl(), namespace,
pageIdentifier) urlStartsWith(url, pageIdentifier))
{
matches = true;
}
