You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/03/18 02:08:30 UTC
svn commit: r924578 [1/3] - in /wicket/trunk: wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/ wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/ wicket-examples/src/main/java/org/apache/wicket/examples/aut...

Author: ivaynberg
Date: Thu Mar 18 01:08:25 2010
New Revision: 924578

URL: http://svn.apache.org/viewvc?rev=924578&view=rev
Log:
more request module wip

Added:
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebRequest.java   (contents, props changed)
      - copied, changed from r924375, wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequest.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebResponse.java   (contents, props changed)
      - copied, changed from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponse.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/IExceptionMapper.java
      - copied, changed from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/IExceptionMapper.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
      - copied, changed from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestHandlerStack.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlDecoder.java
      - copied, changed from r924375, wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WicketURLDecoder.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java
      - copied, changed from r924375, wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WicketURLEncoder.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
      - copied, changed from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/UrlRenderer.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
      - copied, changed from r924086, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
      - copied, changed from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/ICompoundRequestMapper.java   (contents, props changed)
      - copied, changed from r924375, wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/ICompoundRequestMapper.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java   (props changed)
      - copied unchanged from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/IMountedRequestMapper.java
      - copied unchanged from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/IMountedRequestMapper.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java
      - copied unchanged from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
      - copied unchanged from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java
      - copied unchanged from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java
      - copied unchanged from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java
      - copied unchanged from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameters/
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameters/IPageParametersEncoder.java
      - copied, changed from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/parameters/IPageParametersEncoder.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameters/PageParameters.java
      - copied, changed from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/PageParameters.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameters/PageParametersEncoder.java
      - copied, changed from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/parameters/SimplePageParametersEncoder.java
    wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java   (with props)
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java
      - copied, changed from r924086, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
Removed:
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WicketURLDecoder.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WicketURLEncoder.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/ICompoundRequestMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequest.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponse.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/PageParameters.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/IExceptionMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestHandlerStack.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/UrlRenderer.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/IMountedRequestMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/parameters/IPageParametersEncoder.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/parameters/SimplePageParametersEncoder.java
Modified:
    wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java
    wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/NonBookmarkablePage.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2QP.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
    wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
    wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/HelloWorld.java
    wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/package.html
    wicket/trunk/wicket/src/main/java/org/apache/wicket/AbortException.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/DefaultExceptionMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/IPageFactory.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseException.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/SystemMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestablePage.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycleContext.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageClassRequestHandler.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageProvider.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkablePageRequestHandler.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/ListenerInterfaceRequestHandler.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractResourceReferenceMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/HomePageMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/IPageSource.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/IResource.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPage.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/autolink/Index.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/page/HomePage.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/HomePage.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_1.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/model/HomePage.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketURLTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/HomePage.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/HomePage.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java

Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java Thu Mar 18 01:08:25 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.authentication
 
 import org.apache.wicket.authentication.panel.SignInPanel;
 import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 
 /**

Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java Thu Mar 18 01:08:25 2010
@@ -17,7 +17,7 @@
 package org.apache.wicket.authentication.pages;
 
 import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 /**
  * Simple sign out page.

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.java Thu Mar 18 01:08:25 2010
@@ -17,7 +17,7 @@
 package org.apache.wicket.examples.authentication1;
 
 import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 /**
  * Simple logout page.

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.java Thu Mar 18 01:08:25 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.examples.authentication2;
 
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 /**
  * Simple home page which requires authentication

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.java Thu Mar 18 01:08:25 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.examples.authe
 
 import org.apache.wicket.authentication.panel.SignInPanel;
 import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 
 /**

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.java Thu Mar 18 01:08:25 2010
@@ -17,7 +17,7 @@
 package org.apache.wicket.examples.authentication2;
 
 import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 /**
  * Simple logout page.

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.java Thu Mar 18 01:08:25 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.examples.authe
 
 import org.apache.wicket.authentication.panel.SignInPanel;
 import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 
 /**

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.java Thu Mar 18 01:08:25 2010
@@ -17,7 +17,7 @@
 package org.apache.wicket.examples.authentication3;
 
 import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 /**
  * Simple logout page.

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java Thu Mar 18 01:08:25 2010
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.html.for
 import org.apache.wicket.markup.html.image.Image;
 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;
 import org.apache.wicket.util.value.ValueMap;
 
 

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java Thu Mar 18 01:08:25 2010
@@ -19,11 +19,11 @@ package org.apache.wicket.examples.compr
 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;
 
 /**
  * Example page that cannot be bookmarked. A page is bookmarkable when it has a public default
- * constructor and/or a public constructor with a {@link org.apache.wicket.PageParameters} argument.
+ * constructor and/or a public constructor with a {@link org.apache.wicket.request.mapper.parameters.PageParameters} argument.
  * 
  * @author Eelco Hillenius
  */

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java Thu Mar 18 01:08:25 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.examples.compr
 
 import org.apache.wicket.examples.WicketExamplePage;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 
 /**

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/NonBookmarkablePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/NonBookmarkablePage.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/NonBookmarkablePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/NonBookmarkablePage.java Thu Mar 18 01:08:25 2010
@@ -21,7 +21,7 @@ import org.apache.wicket.markup.html.lin
 
 /**
  * Example page that cannot be bookmarked. A page is bookmarkable when it has a public default
- * constructor and/or a constructor with a {@link org.apache.wicket.PageParameters} argument.
+ * constructor and/or a constructor with a {@link org.apache.wicket.request.mapper.parameters.PageParameters} argument.
  * 
  * @author Eelco Hillenius
  */

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java Thu Mar 18 01:08:25 2010
@@ -22,7 +22,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.wicket.examples.WicketExamplePage;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 
 /**

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java Thu Mar 18 01:08:25 2010
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.html.lis
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 /**
  * The main guess page for the hangman application.

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java Thu Mar 18 01:08:25 2010
@@ -17,7 +17,7 @@
 package org.apache.wicket.examples.hangman;
 
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 /**
  * The home page for the hangman application. Contains just a single hyperlink to the actual guess

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java Thu Mar 18 01:08:25 2010
@@ -22,7 +22,7 @@ import org.apache.wicket.ajax.AjaxReques
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.examples.WicketExamplePage;
 import org.apache.wicket.extensions.captcha.kittens.KittenCaptchaPanel;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 /**
  * Kitten captcha example

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java Thu Mar 18 01:08:25 2010
@@ -22,7 +22,7 @@ import org.apache.wicket.examples.librar
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 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.string.StringList;
 import org.apache.wicket.util.string.StringValueConversionException;
 

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java Thu Mar 18 01:08:25 2010
@@ -25,7 +25,7 @@ import org.apache.wicket.markup.html.lis
 import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 
 /**

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java Thu Mar 18 01:08:25 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.examples.libra
 
 import org.apache.wicket.authentication.panel.SignInPanel;
 import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 
 /**

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.java Thu Mar 18 01:08:25 2010
@@ -17,7 +17,7 @@
 package org.apache.wicket.examples.library;
 
 import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 /**
  * Simple logout page.

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java Thu Mar 18 01:08:25 2010
@@ -17,7 +17,7 @@
 package org.apache.wicket.examples.linkomatic;
 
 import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 
 /**

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java Thu Mar 18 01:08:25 2010
@@ -17,7 +17,7 @@
 package org.apache.wicket.examples.linkomatic;
 
 import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 
 /**

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java Thu Mar 18 01:08:25 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.examples.linko
 
 import org.apache.wicket.examples.WicketExamplePage;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 
 /**

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java Thu Mar 18 01:08:25 2010
@@ -31,7 +31,7 @@ import org.apache.wicket.extensions.mark
 import org.apache.wicket.extensions.markup.html.tree.DefaultAbstractTree.LinkType;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 
 /**

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java Thu Mar 18 01:08:25 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.examples.niceu
 
 import org.apache.wicket.examples.WicketExamplePage;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 
 /**

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java Thu Mar 18 01:08:25 2010
@@ -21,7 +21,7 @@ import java.util.Random;
 import org.apache.wicket.examples.WicketExamplePage;
 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;
 
 
 /**

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2QP.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2QP.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2QP.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2QP.java Thu Mar 18 01:08:25 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.examples.niceurl;
 
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 /**
  * Simple bookmarkable page that displays page parameters which is mounted with another parameter

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java Thu Mar 18 01:08:25 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.examples.niceu
 import org.apache.wicket.examples.WicketExamplePage;
 import org.apache.wicket.examples.niceurl.Home;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 
 /**

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java Thu Mar 18 01:08:25 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.examples.niceu
 import org.apache.wicket.examples.WicketExamplePage;
 import org.apache.wicket.examples.niceurl.Home;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 
 /**

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java Thu Mar 18 01:08:25 2010
@@ -23,7 +23,7 @@ import org.apache.wicket.examples.Wicket
 import org.apache.wicket.examples.niceurl.Home;
 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;
 
 
 /**

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java Thu Mar 18 01:08:25 2010
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.html.ima
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.StringResourceModel;
-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.util.value.ValueMap;
 

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java Thu Mar 18 01:08:25 2010
@@ -23,7 +23,7 @@ import org.apache.wicket.markup.html.bas
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.StringResourceModel;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 import org.apache.wicket.util.value.ValueMap;
 
 

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java Thu Mar 18 01:08:25 2010
@@ -49,7 +49,7 @@ import org.apache.wicket.markup.html.lis
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.protocol.http.request.WebErrorCodeResponseHandler;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 import org.apache.wicket.util.io.IOUtils;
 import org.apache.wicket.util.lang.PackageName;
 import org.apache.wicket.util.string.AppendingStringBuffer;

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java Thu Mar 18 01:08:25 2010
@@ -38,7 +38,7 @@ import org.apache.wicket.markup.html.pan
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 import org.apache.wicket.util.file.Files;
 import org.apache.wicket.util.file.Folder;
 import org.apache.wicket.util.lang.Bytes;

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java Thu Mar 18 01:08:25 2010
@@ -35,7 +35,7 @@ import org.apache.wicket.markup.html.lis
 import org.apache.wicket.markup.html.panel.FeedbackPanel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 import org.apache.wicket.util.file.Files;
 import org.apache.wicket.util.file.Folder;
 import org.apache.wicket.util.lang.Bytes;

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java Thu Mar 18 01:08:25 2010
@@ -23,7 +23,7 @@ import java.util.Map;
 import org.apache.wicket.examples.WicketExamplePage;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.util.MapModel;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 import org.apache.wicket.util.resource.IStringResourceStream;
 import org.apache.wicket.util.resource.PackageResourceStream;
 import org.apache.wicket.velocity.markup.html.VelocityPanel;

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java Thu Mar 18 01:08:25 2010
@@ -27,7 +27,7 @@ import org.apache.wicket.markup.html.pan
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 import org.apache.wicket.util.resource.IStringResourceStream;
 import org.apache.wicket.util.resource.PackageResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;

Modified: wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java (original)
+++ wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java Thu Mar 18 01:08:25 2010
@@ -22,7 +22,7 @@ import junit.framework.Assert;
 import junit.framework.TestCase;
 
 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.util.tester.WicketTester;
 
 /**

Modified: wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/HelloWorld.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/HelloWorld.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/HelloWorld.java (original)
+++ wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/HelloWorld.java Thu Mar 18 01:08:25 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.filtertest;
 
 import org.apache.wicket.examples.WicketExamplePage;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.parameters.PageParameters;
 
 
 /**

Modified: wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java (original)
+++ wicket/trunk/wicket-extensions/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;
 
 /**

Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebRequest.java (from r924375, wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequest.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebRequest.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebRequest.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequest.java&r1=924375&r2=924578&rev=924578&view=diff
==============================================================================
    (empty)

Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebRequest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebRequest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebResponse.java (from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponse.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebResponse.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebResponse.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponse.java&r1=924078&r2=924578&rev=924578&view=diff
==============================================================================
    (empty)

Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebResponse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebResponse.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/IExceptionMapper.java (from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/IExceptionMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/IExceptionMapper.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/IExceptionMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/IExceptionMapper.java&r1=924078&r2=924578&rev=924578&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/IExceptionMapper.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/IExceptionMapper.java Thu Mar 18 01:08:25 2010
@@ -14,9 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.request.cycle;
+package org.apache.wicket.request;
 
-import org.apache.wicket.request.IRequestHandler;
 
 /**
  * Maps exception to {@link IRequestHandler}.

Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java (from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestHandlerStack.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestHandlerStack.java&r1=924078&r2=924578&rev=924578&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestHandlerStack.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java Thu Mar 18 01:08:25 2010
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.request.cycle;
+package org.apache.wicket.request;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.wicket.Response;
-import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.util.lang.Exceptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,6 +29,7 @@ import org.slf4j.LoggerFactory;
  * Manages stack of {@link IRequestHandler}s.
  * 
  * @author Matej Knopp
+ * @author igor.vaynberg
  */
 public abstract class RequestHandlerStack
 {
@@ -54,12 +54,13 @@ public abstract class RequestHandlerStac
 		this.response = response;
 	}
 
-	protected abstract RequestCycle getRequestCycle();
+	protected abstract IRequestCycle getRequestCycle();
 
 	/**
 	 * Returns currently active {@link IRequestHandler}.
 	 * 
-	 * @return Active RequestHandler or <code>null</code> if no handler is active.
+	 * @return Active RequestHandler or <code>null</code> if no handler is
+	 *         active.
 	 */
 	public IRequestHandler getActiveRequestHandler()
 	{
@@ -67,9 +68,10 @@ public abstract class RequestHandlerStac
 	}
 
 	/**
-	 * Executes the specified {@link IRequestHandler}. When the specified {@link IRequestHandler}
-	 * finishes, the {@link IRequestHandler} that invoked this method continues (unless the new
-	 * {@link IRequestHandler} called {@link #replaceAllRequestHandlers(IRequestHandler)}.
+	 * Executes the specified {@link IRequestHandler}. When the specified
+	 * {@link IRequestHandler} finishes, the {@link IRequestHandler} that
+	 * invoked this method continues (unless the new {@link IRequestHandler}
+	 * called {@link #replaceAllRequestHandlers(IRequestHandler)}.
 	 * 
 	 * @param handler
 	 */
@@ -84,13 +86,21 @@ public abstract class RequestHandlerStac
 		{
 			handler.respond(getRequestCycle());
 		}
-		catch (ReplaceHandlerException exception)
+		catch (RuntimeException exception)
 		{
-			if (exception.removeAll && !first)
+			ReplaceHandlerException replacer = Exceptions.findCause(exception,
+					ReplaceHandlerException.class);
+			
+			if (replacer == null)
 			{
 				throw exception;
 			}
-			replacementHandler = exception.replacementRequestHandler;
+			
+			if (replacer.removeAll && !first)
+			{
+				throw (RuntimeException)exception;
+			}
+			replacementHandler = replacer.replacementRequestHandler;
 		}
 		finally
 		{
@@ -113,11 +123,13 @@ public abstract class RequestHandlerStac
 	}
 
 	/**
-	 * Schedules the request handler to be executed after current request handler finishes. If there
-	 * is already another request handler scheduled it will be discarded and overwritten by the new
-	 * one. If {@link #replaceCurrentRequestHandler(IRequestHandler)} or
-	 * {@link #replaceAllRequestHandlers(IRequestHandler)} is invoked during current request handler
-	 * execution the scheduled handler will be also discarded.
+	 * Schedules the request handler to be executed after current request
+	 * handler finishes. If there is already another request handler scheduled
+	 * it will be discarded and overwritten by the new one. If
+	 * {@link #replaceCurrentRequestHandler(IRequestHandler)} or
+	 * {@link #replaceAllRequestHandlers(IRequestHandler)} is invoked during
+	 * current request handler execution the scheduled handler will be also
+	 * discarded.
 	 * 
 	 * @param handler
 	 *            handler to be executed after current request handler finishes
@@ -128,17 +140,20 @@ public abstract class RequestHandlerStac
 	}
 
 	/**
-	 * Replaces the currently executed {@link IRequestHandler} with new {@link IRequestHandler}. The
-	 * currently executed {@link IRequestHandler} is terminated and the new {@link IRequestHandler}
-	 * is executed.
+	 * Replaces the currently executed {@link IRequestHandler} with new
+	 * {@link IRequestHandler}. The currently executed {@link IRequestHandler}
+	 * is terminated and the new {@link IRequestHandler} is executed.
 	 * 
 	 * @param handler
 	 */
 	// FIXME
-	// Is this method really useful for anything? To execute request handler after current
-	// #scheduleRequestHandlerAfterCurrent is better alternative because it doesn't terminate
+	// Is this method really useful for anything? To execute request handler
+	// after current
+	// #scheduleRequestHandlerAfterCurrent is better alternative because it
+	// doesn't terminate
 	// current request handler.
-	// To restart request processing #replaceAllRequestHandlers is better alternative because it
+	// To restart request processing #replaceAllRequestHandlers is better
+	// alternative because it
 	// unrolls entire stack and cancels all request handlers in stack
 	public void replaceCurrentRequestHandler(IRequestHandler handler)
 	{
@@ -153,8 +168,9 @@ public abstract class RequestHandlerStac
 	}
 
 	/**
-	 * Removes the whole {@link IRequestHandler} stack, terminates currently running
-	 * {@link IRequestHandler} and executes the new {@link IRequestHandler}.
+	 * Removes the whole {@link IRequestHandler} stack, terminates currently
+	 * running {@link IRequestHandler} and executes the new
+	 * {@link IRequestHandler}.
 	 * 
 	 * @param handler
 	 */
@@ -181,9 +197,9 @@ public abstract class RequestHandlerStac
 	}
 
 	/**
-	 * Replaces current {@link Response} with new {@link Response} instance. The original response
-	 * is always restored after the {@link IRequestHandler#respond(RequestCycle)} method is
-	 * finished.
+	 * Replaces current {@link Response} with new {@link Response} instance. The
+	 * original response is always restored after the
+	 * {@link IRequestHandler#respond(RequestCycle)} method is finished.
 	 * 
 	 * @param response
 	 * @return Response being replaced.
@@ -227,7 +243,7 @@ public abstract class RequestHandlerStac
 	 * 
 	 * @author Matej Knopp
 	 */
-	public static class ReplaceHandlerException extends WicketRuntimeException
+	public static class ReplaceHandlerException extends RuntimeException
 	{
 		private static final long serialVersionUID = 1L;
 

Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java?rev=924578&r1=924577&r2=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java Thu Mar 18 01:08:25 2010
@@ -22,8 +22,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.wicket.protocol.http.WicketURLDecoder;
-import org.apache.wicket.protocol.http.WicketURLEncoder;
 import org.apache.wicket.util.lang.Checks;
 import org.apache.wicket.util.lang.Objects;
 import org.apache.wicket.util.string.StringValue;
@@ -441,7 +439,7 @@ public final class Url implements Serial
 	 */
 	private static String encodeSegment(String string, Charset charset)
 	{
-		return WicketURLEncoder.PATH_INSTANCE.encode(string, charset);
+		return UrlEncoder.PATH_INSTANCE.encode(string, charset);
 	}
 
 	/**
@@ -451,7 +449,7 @@ public final class Url implements Serial
 	 */
 	private static String decodeSegment(String string, Charset charset)
 	{
-		return WicketURLDecoder.PATH_INSTANCE.decode(string, charset);
+		return UrlDecoder.PATH_INSTANCE.decode(string, charset);
 	}
 
 	/**
@@ -461,7 +459,7 @@ public final class Url implements Serial
 	 */
 	private static String encodeParameter(String string, Charset charset)
 	{
-		return WicketURLEncoder.QUERY_INSTANCE.encode(string, charset);
+		return UrlEncoder.QUERY_INSTANCE.encode(string, charset);
 	}
 
 	/**
@@ -471,7 +469,7 @@ public final class Url implements Serial
 	 */
 	private static String decodeParameter(String string, Charset charset)
 	{
-		return WicketURLDecoder.QUERY_INSTANCE.decode(string, charset);
+		return UrlDecoder.QUERY_INSTANCE.decode(string, charset);
 	}
 
 

Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlDecoder.java (from r924375, wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WicketURLDecoder.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlDecoder.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlDecoder.java&p1=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WicketURLDecoder.java&r1=924375&r2=924578&rev=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WicketURLDecoder.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlDecoder.java Thu Mar 18 01:08:25 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.protocol.http;
+package org.apache.wicket.request;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
@@ -34,9 +34,9 @@ import org.slf4j.LoggerFactory;
  * @see java.net.URLDecoder
  * @see {@link "http://www.ietf.org/rfc/rfc2396.txt"}
  */
-public class WicketURLDecoder
+public class UrlDecoder
 {
-	private static final Logger log = LoggerFactory.getLogger(WicketURLDecoder.class);
+	private static final Logger log = LoggerFactory.getLogger(UrlDecoder.class);
 
 	private final boolean decodePlus;
 
@@ -47,7 +47,7 @@ public class WicketURLDecoder
 	 * For example:
 	 * http://org.acme/notthis/northis/oreventhis?buthis=isokay&asis=thispart
 	 */
-	public static final WicketURLDecoder QUERY_INSTANCE = new WicketURLDecoder(true);
+	public static final UrlDecoder QUERY_INSTANCE = new UrlDecoder(true);
 
 	/**
 	 * Encoder used to decode components of a path.<br/>
@@ -55,7 +55,7 @@ public class WicketURLDecoder
 	 * 
 	 * For example: http://org.acme/foo/thispart/orthispart?butnot=thispart
 	 */
-	public static final WicketURLDecoder PATH_INSTANCE = new WicketURLDecoder(false);
+	public static final UrlDecoder PATH_INSTANCE = new UrlDecoder(false);
 
 	/**
 	 * Create decoder
@@ -63,7 +63,7 @@ public class WicketURLDecoder
 	 * @param decodePlus
 	 *            - whether to decode + to space
 	 */
-	private WicketURLDecoder(boolean decodePlus)
+	private UrlDecoder(boolean decodePlus)
 	{
 		this.decodePlus = decodePlus;
 	}

Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java (from r924375, wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WicketURLEncoder.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java&p1=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WicketURLEncoder.java&r1=924375&r2=924578&rev=924578&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WicketURLEncoder.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java Thu Mar 18 01:08:25 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.protocol.http;
+package org.apache.wicket.request;
 
 import java.io.CharArrayWriter;
 import java.io.UnsupportedEncodingException;
@@ -38,9 +38,9 @@ import org.slf4j.LoggerFactory;
  * @see java.net.URLEncoder
  * @see {@link "http://www.ietf.org/rfc/rfc2396.txt"}
  */
-public class WicketURLEncoder
+public class UrlEncoder
 {
-	private static final Logger log = LoggerFactory.getLogger(WicketURLEncoder.class);
+	private static final Logger log = LoggerFactory.getLogger(UrlEncoder.class);
 
 	/**
 	 * encoder types
@@ -77,7 +77,7 @@ public class WicketURLEncoder
 	 * For example:
 	 * http://org.acme/notthis/northis/oreventhis?buthis=isokay&asis=thispart
 	 */
-	public static final WicketURLEncoder QUERY_INSTANCE = new WicketURLEncoder(Type.QUERY, '\0');
+	public static final UrlEncoder QUERY_INSTANCE = new UrlEncoder(Type.QUERY, '\0');
 
 	/**
 	 * Encoder used to encode components of a path.<br/>
@@ -85,7 +85,7 @@ public class WicketURLEncoder
 	 * 
 	 * For example: http://org.acme/foo/thispart/orthispart?butnot=thispart
 	 */
-	public static final WicketURLEncoder PATH_INSTANCE = new WicketURLEncoder(Type.PATH, '\0');
+	public static final UrlEncoder PATH_INSTANCE = new UrlEncoder(Type.PATH, '\0');
 
 	/**
 	 * Encoder used to encode all path segments. Querystring will be excluded.<br/>
@@ -93,7 +93,7 @@ public class WicketURLEncoder
 	 * 
 	 * For example: http://org.acme/foo/thispart/orthispart?butnot=thispart
 	 */
-	public static final WicketURLEncoder FULL_PATH_INSTANCE = new WicketURLEncoder(Type.FULL_PATH,
+	public static final UrlEncoder FULL_PATH_INSTANCE = new UrlEncoder(Type.FULL_PATH,
 			'?');
 
 	/**
@@ -104,7 +104,7 @@ public class WicketURLEncoder
 	 * @param stopChar
 	 *            stop encoding when stopChar found
 	 */
-	protected WicketURLEncoder(Type type, char stopChar)
+	protected UrlEncoder(Type type, char stopChar)
 	{
 		this.stopChar = stopChar;
 

Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java (from r924078, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/UrlRenderer.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/UrlRenderer.java&r1=924078&r2=924578&rev=924578&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/UrlRenderer.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java Thu Mar 18 01:08:25 2010
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.request.cycle;
+package org.apache.wicket.request;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.wicket.request.Request;
-import org.apache.wicket.request.Url;
 import org.apache.wicket.util.lang.Checks;
 import org.apache.wicket.util.string.PrependingStringBuffer;