Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java?rev=924639&r1=924638&r2=924639&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java Thu Mar 18 05:28:53 2010 @@ -16,13 +16,13 @@ */ package org.apache.wicket.session; -import org.apache.wicket.AbstractRestartResponseException; import org.apache.wicket.IPageFactory; import org.apache.wicket.Page; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.request.handler.basic.EmptyRequestHandler; -import org.apache.wicket.request.mapper.parameters.PageParameters; +import org.apache.wicket.request.flow.ResetResponseException; +import org.apache.wicket.request.handler.EmptyRequestHandler; +import org.apache.wicket.request.mapper.parameter.PageParameters; /** @@ -44,7 +44,7 @@ public class DefaultPageFactoryTest exte */ public AbortAndRespondPage1() { - throw new AbstractRestartResponseException(EmptyRequestHandler.getInstance()) + throw new ResetResponseException(new EmptyRequestHandler()) { /** @@ -70,7 +70,7 @@ public class DefaultPageFactoryTest exte */ public AbortAndRespondPage2(PageParameters params) { - throw new AbstractRestartResponseException(EmptyRequestHandler.getInstance()) + throw new ResetResponseException(new EmptyRequestHandler()) { /** @@ -95,7 +95,7 @@ public class DefaultPageFactoryTest exte */ public AbortAndRespondPage3() { - throw new AbstractRestartResponseException(EmptyRequestHandler.getInstance()) + throw new ResetResponseException(new EmptyRequestHandler()) { /** @@ -113,7 +113,7 @@ public class DefaultPageFactoryTest exte */ public AbortAndRespondPage3(PageParameters params) { - throw new AbstractRestartResponseException(EmptyRequestHandler.getInstance()) + throw new ResetResponseException(new EmptyRequestHandler()) { /** @@ -161,7 +161,7 @@ public class DefaultPageFactoryTest exte pageFactory.newPage(AbortAndRespondPage1.class); fail(); } - catch (AbstractRestartResponseException e) + catch (ResetResponseException e) { // noop } @@ -171,7 +171,7 @@ public class DefaultPageFactoryTest exte pageFactory.newPage(AbortAndRespondPage2.class); fail(); } - catch (AbstractRestartResponseException e) + catch (ResetResponseException e) { // noop } @@ -181,7 +181,7 @@ public class DefaultPageFactoryTest exte pageFactory.newPage(AbortAndRespondPage2.class, new PageParameters()); fail(); } - catch (AbstractRestartResponseException e) + catch (ResetResponseException e) { // noop } @@ -191,7 +191,7 @@ public class DefaultPageFactoryTest exte pageFactory.newPage(AbortAndRespondPage3.class); fail(); } - catch (AbstractRestartResponseException e) + catch (ResetResponseException e) { // noop } @@ -201,7 +201,7 @@ public class DefaultPageFactoryTest exte pageFactory.newPage(AbortAndRespondPage3.class, new PageParameters()); fail(); } - catch (AbstractRestartResponseException e) + catch (ResetResponseException e) { // noop }
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java?rev=924639&r1=924638&r2=924639&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java Thu Mar 18 05:28:53 2010 @@ -19,7 +19,7 @@ package org.apache.wicket.stateless; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.link.StatelessLink; -import org.apache.wicket.request.mapper.parameters.PageParameters; +import org.apache.wicket.request.mapper.parameter.PageParameters; /** * @author jcompagner Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java?rev=924639&r1=924638&r2=924639&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java Thu Mar 18 05:28:53 2010 @@ -18,7 +18,7 @@ package org.apache.wicket.stateless; import org.apache.wicket.WicketTestCase; import org.apache.wicket.request.Url; -import org.apache.wicket.request.mapper.parameters.PageParameters; +import org.apache.wicket.request.mapper.parameter.PageParameters; /** * @author jcompagner Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java?rev=924639&r1=924638&r2=924639&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java Thu Mar 18 05:28:53 2010 @@ -21,7 +21,7 @@ import java.util.Locale; import org.apache.wicket.Session; import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.html.form.upload.FileUpload; -import org.apache.wicket.request.mapper.parameters.PageParameters; +import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.file.File; import org.apache.wicket.util.tester.MockFormFileUploadPage.MockDomainObjectFileUpload; import org.apache.wicket.util.tester.MockFormPage.MockDomainObject; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java?rev=924639&r1=924638&r2=924639&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java Thu Mar 18 05:28:53 2010 @@ -25,7 +25,7 @@ import org.apache.wicket.markup.html.for import org.apache.wicket.markup.html.form.upload.FileUploadField; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.Model; -import org.apache.wicket.request.mapper.parameters.PageParameters; +import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.lang.Bytes; import org.apache.wicket.util.string.StringValue; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java?rev=924639&r1=924638&r2=924639&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java Thu Mar 18 05:28:53 2010 @@ -19,7 +19,7 @@ package org.apache.wicket.util.tester; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.BookmarkablePageLink; -import org.apache.wicket.request.mapper.parameters.PageParameters; +import org.apache.wicket.request.mapper.parameter.PageParameters; /** * Mock page for testing PageParameters handling in WicketTester.
