Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java Thu Mar 18 01:08:25 2010 @@ -27,7 +27,7 @@ import org.apache.wicket.WicketRuntimeEx import org.apache.wicket.authorization.AuthorizationException; import org.apache.wicket.markup.MarkupException; import org.apache.wicket.request.component.IRequestablePage; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; import org.apache.wicket.util.lang.Generics;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Thu Mar 18 01:08:25 2010 @@ -81,12 +81,11 @@ import org.apache.wicket.protocol.http.m import org.apache.wicket.protocol.http.mock.MockHttpSession; import org.apache.wicket.protocol.http.servlet.ServletWebRequest; import org.apache.wicket.protocol.http.servlet.ServletWebResponse; +import org.apache.wicket.request.IExceptionMapper; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.IRequestMapper; import org.apache.wicket.request.Request; import org.apache.wicket.request.Url; -import org.apache.wicket.request.component.PageParameters; -import org.apache.wicket.request.cycle.IExceptionMapper; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.cycle.RequestCycleContext; import org.apache.wicket.request.handler.IPageProvider; @@ -96,6 +95,7 @@ import org.apache.wicket.request.handler import org.apache.wicket.request.handler.impl.ListenerInterfaceRequestHandler; import org.apache.wicket.request.handler.impl.RenderPageRequestHandler; import org.apache.wicket.request.handler.impl.render.PageRenderer; +import org.apache.wicket.request.mapper.parameters.PageParameters; import org.apache.wicket.session.ISessionStore; import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy; import org.apache.wicket.util.IProvider; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPage.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPage.java Thu Mar 18 01:08:25 2010 @@ -17,7 +17,7 @@ package org.apache.wicket; import org.apache.wicket.request.component.IRequestablePage; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Simple {...@link IRequestablePage} implementation for testing purposes Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java Thu Mar 18 01:08:25 2010 @@ -16,7 +16,7 @@ */ package org.apache.wicket; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; import org.apache.wicket.session.DefaultPageFactory; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java Thu Mar 18 01:08:25 2010 @@ -16,7 +16,7 @@ */ package org.apache.wicket; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.request.resource.SharedResourceReference; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java Thu Mar 18 01:08:25 2010 @@ -19,7 +19,7 @@ package org.apache.wicket; import junit.framework.TestCase; import org.apache.wicket.behavior.AbstractAjaxBehavior; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; import org.apache.wicket.util.tester.WicketTester; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java Thu Mar 18 01:08:25 2010 @@ -20,7 +20,7 @@ import org.apache.wicket.ajax.markup.htm import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Homepage WICKET-2328 Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/autolink/Index.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/autolink/Index.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/autolink/Index.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/autolink/Index.java Thu Mar 18 01:08:25 2010 @@ -16,7 +16,7 @@ */ package org.apache.wicket.markup.html.autolink; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Basic bookmarkable index page. Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java Thu Mar 18 01:08:25 2010 @@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.ba import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * @author jcompagner Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java Thu Mar 18 01:08:25 2010 @@ -24,7 +24,7 @@ import org.apache.wicket.markup.html.pan import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * FormHasErrorPage Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java Thu Mar 18 01:08:25 2010 @@ -20,7 +20,7 @@ import org.apache.wicket.markup.html.Web import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Homepage Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java Thu Mar 18 01:08:25 2010 @@ -22,7 +22,7 @@ import java.util.Locale; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.ImageButton; import org.apache.wicket.markup.html.link.Link; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; import org.apache.wicket.request.resource.PackageResourceReference; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java Thu Mar 18 01:08:25 2010 @@ -25,7 +25,7 @@ import org.apache.wicket.markup.html.for import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Homepage Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1.java Thu Mar 18 01:08:25 2010 @@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.fo import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Homepage Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java Thu Mar 18 01:08:25 2010 @@ -20,7 +20,7 @@ import java.util.Locale; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.link.Link; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; import org.apache.wicket.request.resource.PackageResourceReference; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java Thu Mar 18 01:08:25 2010 @@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.in import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Mock page for testing. Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java Thu Mar 18 01:08:25 2010 @@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.in import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Mock page for testing. Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java Thu Mar 18 01:08:25 2010 @@ -21,7 +21,7 @@ import java.io.IOException; import org.apache.wicket.Page; import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.html.form.CheckBox; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; import org.apache.wicket.util.tester.DiffUtil; import org.apache.wicket.util.tester.FormTester; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java Thu Mar 18 01:08:25 2010 @@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.li import org.apache.wicket.Application; import org.apache.wicket.Page; import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * @author jcompagner Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java Thu Mar 18 01:08:25 2010 @@ -17,7 +17,7 @@ package org.apache.wicket.markup.html.link; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * @author jcompagner Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/page/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/page/HomePage.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/page/HomePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/page/HomePage.java Thu Mar 18 01:08:25 2010 @@ -21,7 +21,7 @@ import org.apache.wicket.markup.html.Web import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.Model; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Homepage Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/HomePage.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/HomePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/HomePage.java Thu Mar 18 01:08:25 2010 @@ -19,7 +19,7 @@ package org.apache.wicket.markup.parser; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.FeedbackPanel; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_1.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_1.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_1.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_1.java Thu Mar 18 01:08:25 2010 @@ -18,7 +18,7 @@ package org.apache.wicket.markup.resolve import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Homepage Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java Thu Mar 18 01:08:25 2010 @@ -19,7 +19,7 @@ package org.apache.wicket.markup.resolve import org.apache.wicket.behavior.CssHeaderContributor; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Homepage Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/HomePage.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/HomePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/HomePage.java Thu Mar 18 01:08:25 2010 @@ -23,7 +23,7 @@ import org.apache.wicket.markup.html.for import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.form.validation.FormComponentFeedbackBorder; import org.apache.wicket.markup.html.panel.FeedbackPanel; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; import org.apache.wicket.validation.validator.StringValidator; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketURLTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketURLTest.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketURLTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketURLTest.java Thu Mar 18 01:08:25 2010 @@ -16,6 +16,9 @@ */ package org.apache.wicket.protocol.http; +import org.apache.wicket.request.UrlDecoder; +import org.apache.wicket.request.UrlEncoder; + import junit.framework.TestCase; /** @@ -25,25 +28,25 @@ public class WicketURLTest extends TestC { public void testPathEncoder() { - assertEquals("+", WicketURLEncoder.PATH_INSTANCE.encode("+", "UTF-8")); - assertEquals("%20", WicketURLEncoder.PATH_INSTANCE.encode(" ", "UTF-8")); + assertEquals("+", UrlEncoder.PATH_INSTANCE.encode("+", "UTF-8")); + assertEquals("%20", UrlEncoder.PATH_INSTANCE.encode(" ", "UTF-8")); } public void testQueryEncoder() { - assertEquals("+", WicketURLEncoder.QUERY_INSTANCE.encode(" ", "UTF-8")); - assertEquals("%2B", WicketURLEncoder.QUERY_INSTANCE.encode("+", "UTF-8")); + assertEquals("+", UrlEncoder.QUERY_INSTANCE.encode(" ", "UTF-8")); + assertEquals("%2B", UrlEncoder.QUERY_INSTANCE.encode("+", "UTF-8")); } public void testPathDecoder() { - assertEquals("+", WicketURLDecoder.PATH_INSTANCE.decode("+", "UTF-8")); - assertEquals(" ", WicketURLDecoder.PATH_INSTANCE.decode("%20", "UTF-8")); + assertEquals("+", UrlDecoder.PATH_INSTANCE.decode("+", "UTF-8")); + assertEquals(" ", UrlDecoder.PATH_INSTANCE.decode("%20", "UTF-8")); } public void testQueryDecoder() { - assertEquals(" ", WicketURLDecoder.QUERY_INSTANCE.decode("+", "UTF-8")); - assertEquals("+", WicketURLDecoder.QUERY_INSTANCE.decode("%2B", "UTF-8")); + assertEquals(" ", UrlDecoder.QUERY_INSTANCE.decode("+", "UTF-8")); + assertEquals("+", UrlDecoder.QUERY_INSTANCE.decode("%2B", "UTF-8")); } } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/HomePage.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/HomePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/HomePage.java Thu Mar 18 01:08:25 2010 @@ -21,7 +21,7 @@ import org.apache.wicket.markup.html.bas import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Homepage Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java Thu Mar 18 01:08:25 2010 @@ -25,7 +25,7 @@ import org.apache.wicket.markup.html.lis import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.protocol.http.servlet.AbortWithWebErrorCodeException; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Page that optionally throws an abortexception during render phase. Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java Thu Mar 18 01:08:25 2010 @@ -18,10 +18,9 @@ package org.apache.wicket.redirect.abort import junit.framework.Assert; -import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.WicketTestCase; import org.apache.wicket.protocol.http.servlet.AbortWithWebErrorCodeException; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Testcase for WICKET-1418, throwing an abortexception during rendering. @@ -51,9 +50,9 @@ public class AbortExceptionTest extends { tester.startPage(AbortExceptionPage.class, new PageParameters("trigger=true")); Assert.assertEquals((Integer)1234, tester.getLastResponse().getStatus()); // this will - // fail + // fail } - catch (WicketRuntimeException x) + catch (RuntimeException x) { final Throwable reason = x.getCause(); Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java Thu Mar 18 01:08:25 2010 @@ -19,7 +19,7 @@ package org.apache.wicket.redirect.encod import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Homepage Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/HomePage.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/HomePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/HomePage.java Thu Mar 18 01:08:25 2010 @@ -17,7 +17,7 @@ package org.apache.wicket.redirect.encodingtest; import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Homepage Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java Thu Mar 18 01:08:25 2010 @@ -18,7 +18,7 @@ package org.apache.wicket.redirect.encod import junit.framework.TestCase; -import org.apache.wicket.request.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; import org.apache.wicket.util.tester.WicketTester; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java Thu Mar 18 01:08:25 2010 @@ -21,6 +21,7 @@ import junit.framework.TestCase; import org.apache.wicket.Response; import org.apache.wicket.request.IRequestCycle; import org.apache.wicket.request.IRequestHandler; +import org.apache.wicket.request.RequestHandlerStack; /** * Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java Thu Mar 18 01:08:25 2010 @@ -19,7 +19,7 @@ package org.apache.wicket.request.cycle; import junit.framework.TestCase; import org.apache.wicket.request.Url; -import org.apache.wicket.request.cycle.UrlRenderer; +import org.apache.wicket.request.UrlRenderer; /** * @author MAtej Knopp Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java Thu Mar 18 01:08:25 2010 @@ -20,8 +20,8 @@ import java.util.Locale; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.Url; -import org.apache.wicket.request.component.PageParameters; import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * @author Matej Knopp Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java Thu Mar 18 01:08:25 2010 @@ -22,7 +22,6 @@ import org.apache.wicket.request.IReques import org.apache.wicket.request.Url; import org.apache.wicket.request.component.IRequestableComponent; import org.apache.wicket.request.component.IRequestablePage; -import org.apache.wicket.request.component.PageParameters; import org.apache.wicket.request.handler.IPageProvider; import org.apache.wicket.request.handler.IPageRequestHandler; import org.apache.wicket.request.handler.PageAndComponentProvider; @@ -34,6 +33,7 @@ import org.apache.wicket.request.handler import org.apache.wicket.request.mapper.BookmarkableMapper; import org.apache.wicket.request.mapper.IMapperContext; import org.apache.wicket.request.mapper.StalePageException; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * @author Matej Knopp Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java Thu Mar 18 01:08:25 2010 @@ -23,7 +23,6 @@ import org.apache.wicket.request.IReques import org.apache.wicket.request.Url; import org.apache.wicket.request.component.IRequestableComponent; import org.apache.wicket.request.component.IRequestablePage; -import org.apache.wicket.request.component.PageParameters; import org.apache.wicket.request.handler.IPageProvider; import org.apache.wicket.request.handler.IPageRequestHandler; import org.apache.wicket.request.handler.PageAndComponentProvider; @@ -35,6 +34,7 @@ import org.apache.wicket.request.handler import org.apache.wicket.request.mapper.IMapperContext; import org.apache.wicket.request.mapper.MountedMapper; import org.apache.wicket.request.mapper.StalePageException; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * @author Matej Knopp Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java?rev=924578&r1=924577&r2=924578&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java Thu Mar 18 01:08:25 2010 @@ -22,8 +22,8 @@ import org.apache.wicket.MockPage; import org.apache.wicket.RequestListenerInterface; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.request.component.IRequestablePage; -import org.apache.wicket.request.component.PageParameters; import org.apache.wicket.request.mapper.IMapperContext; +import org.apache.wicket.request.mapper.parameters.PageParameters; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.request.resource.ResourceReferenceRegistry; 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=924578&r1=924577&r2=924578&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 01:08:25 2010 @@ -21,8 +21,8 @@ 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.component.PageParameters; import org.apache.wicket.request.handler.basic.EmptyRequestHandler; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** 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=924578&r1=924577&r2=924578&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 01:08:25 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.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.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=924578&r1=924577&r2=924578&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 01:08:25 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.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.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=924578&r1=924577&r2=924578&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 01:08:25 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.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.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=924578&r1=924577&r2=924578&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 01:08:25 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.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.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=924578&r1=924577&r2=924578&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 01:08:25 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.component.PageParameters; +import org.apache.wicket.request.mapper.parameters.PageParameters; /** * Mock page for testing PageParameters handling in WicketTester.