You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/05/10 13:28:44 UTC
svn commit: r536829 - in /incubator/wicket/trunk/jdk-1.4/wicket/src:
main/java/org/apache/wicket/
main/java/org/apache/wicket/protocol/http/servlet/
test/java/org/apache/wicket/request/target/coding/
Author: ehillenius
Date: Thu May 10 04:28:43 2007
New Revision: 536829
URL: http://svn.apache.org/viewvc?view=rev&rev=536829
Log:
WICKET-552
Removed:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/AbortWithHttpStatusException.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java?view=diff&rev=536829&r1=536828&r2=536829
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java Thu May 10 04:28:43 2007
@@ -18,7 +18,7 @@
import javax.servlet.http.HttpServletResponse;
-import org.apache.wicket.AbortException;
+import org.apache.wicket.AbstractRestartResponseException;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.Response;
import org.apache.wicket.protocol.http.WebResponse;
@@ -36,7 +36,7 @@
* @author Gili Tzabari
* @see HttpServletResponse
*/
-public class AbortWithHttpStatusException extends AbortException
+public class AbortWithHttpStatusException extends AbstractRestartResponseException
{
private static final long serialVersionUID = 1L;
private final int status;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java?view=diff&rev=536829&r1=536828&r2=536829
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java Thu May 10 04:28:43 2007
@@ -19,6 +19,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.AbortException;
+import org.apache.wicket.AbstractRestartResponseException;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.protocol.http.request.WebErrorCodeResponseTarget;
@@ -31,7 +32,7 @@
* @see AbortException
* @see WebErrorCodeResponseTarget
*/
-public final class AbortWithWebErrorCodeException extends AbortException
+public final class AbortWithWebErrorCodeException extends AbstractRestartResponseException
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java?view=diff&rev=536829&r1=536828&r2=536829
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java Thu May 10 04:28:43 2007
@@ -20,9 +20,11 @@
import junit.framework.TestCase;
+import org.apache.wicket.IRequestTarget;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.protocol.http.WebRequestCycle;
import org.apache.wicket.protocol.http.WebRequestCycleProcessor;
-import org.apache.wicket.protocol.http.servlet.AbortWithWebErrorCodeException;
+import org.apache.wicket.protocol.http.request.WebErrorCodeResponseTarget;
import org.apache.wicket.settings.ISecuritySettings;
import org.apache.wicket.util.lang.PackageName;
import org.apache.wicket.util.tester.WicketTester;
@@ -59,7 +61,10 @@
*/
public void testBadRequest3()
{
- tester.getServletRequest().setURL("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/nonexistent.TestPage");
+ tester
+ .getServletRequest()
+ .setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/nonexistent.TestPage");
IRequestTargetUrlCodingStrategy ucs = getRequestCodingStrategy();
assertNotNull(ucs);
try
@@ -84,7 +89,8 @@
{
tester.setupRequestAndResponse();
tester.getServletRequest().setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:" + TestPage.class.getName() + "");
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:"
+ + TestPage.class.getName() + "");
tester.processRequestCycle();
tester.assertRenderedPage(TestPage.class);
}
@@ -103,12 +109,12 @@
"?wicket:bookmarkablePage=:" + TestPage.class.getName() + "");
try
{
- tester.processRequestCycle();
- fail("This request should not have been allowed");
- }
- catch (AbortWithWebErrorCodeException e)
- {
- assertEquals(e.getErrorCode(), HttpServletResponse.SC_FORBIDDEN);
+ WebRequestCycle requestCycle = tester.createRequestCycle();
+ tester.processRequestCycle(requestCycle);
+ IRequestTarget requestTarget = requestCycle.getRequestTarget();
+ assertTrue(requestTarget instanceof WebErrorCodeResponseTarget);
+ WebErrorCodeResponseTarget error = (WebErrorCodeResponseTarget)requestTarget;
+ assertEquals(HttpServletResponse.SC_FORBIDDEN, error.getErrorCode());
}
finally
{
@@ -127,8 +133,11 @@
public void testDirectAccessToMountedPageWithExtraPath()
{
tester.setupRequestAndResponse();
- tester.getServletRequest().setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/foo/bar/?wicket:bookmarkablePage=:" + TestPage.class.getName() + "");
+ tester
+ .getServletRequest()
+ .setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/foo/bar/?wicket:bookmarkablePage=:"
+ + TestPage.class.getName() + "");
tester.processRequestCycle();
tester.assertRenderedPage(TestPage.class);
}
@@ -141,7 +150,10 @@
tester.getApplication().getSecuritySettings().setEnforceMounts(false);
tester.setupRequestAndResponse();
- tester.getServletRequest().setURL("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/TestPage");
+ tester
+ .getServletRequest()
+ .setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/TestPage");
tester.processRequestCycle();
tester.assertRenderedPage(TestPage.class);
}
@@ -151,7 +163,8 @@
*/
public void testValidMount1()
{
- tester.getServletRequest().setURL("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point");
+ tester.getServletRequest().setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point");
IRequestTargetUrlCodingStrategy ucs = getRequestCodingStrategy();
assertNotNull(ucs);
assertNull(ucs.decode(tester.getWicketRequest().getRequestParameters()));
@@ -162,7 +175,10 @@
*/
public void testValidMount2()
{
- tester.getServletRequest().setURL("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/TestPage");
+ tester
+ .getServletRequest()
+ .setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/TestPage");
IRequestTargetUrlCodingStrategy ucs = getRequestCodingStrategy();
assertNotNull(ucs);
assertNotNull(ucs.decode(tester.getWicketRequest().getRequestParameters()));