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 06:28:58 UTC
svn commit: r924639 [3/4] - in /wicket/trunk:
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/
wicket-auth-roles/src/main/java/org/apache/wicket/authentication/
wicket-auth-roles/src/main/java/org/apache/wicket/authentica...
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebRequest.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebRequest.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebRequest.java Thu Mar 18 05:28:53 2010
@@ -27,8 +27,8 @@ import java.util.Map;
import javax.servlet.http.Cookie;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.http.WebRequest;
/**
* Mutable mock {@link WebRequest}.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebResponse.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebResponse.java Thu Mar 18 05:28:53 2010
@@ -28,7 +28,7 @@ import java.util.Set;
import javax.servlet.http.Cookie;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.request.http.WebResponse;
/**
* Mocked {@link WebResponse}.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java Thu Mar 18 05:28:53 2010
@@ -24,8 +24,9 @@ import java.util.List;
import javax.servlet.http.Cookie;
-import org.apache.wicket.Response;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.request.Response;
+import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.util.lang.Checks;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java Thu Mar 18 05:28:53 2010
@@ -25,6 +25,7 @@ import javax.servlet.http.Cookie;
import org.apache.wicket.IClusterable;
import org.apache.wicket.markup.html.pages.BrowserInfoPage;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.util.string.AppendingStringBuffer;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java Thu Mar 18 05:28:53 2010
@@ -19,6 +19,8 @@ package org.apache.wicket.protocol.http;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
+import org.apache.wicket.request.http.WebResponse;
+
/**
* Response that keeps headers in buffers but writes the content directly to the response.
*
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java Thu Mar 18 05:28:53 2010
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletReq
import org.apache.wicket.Application;
import org.apache.wicket.request.UrlDecoder;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.string.Strings;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java Thu Mar 18 05:28:53 2010
@@ -26,7 +26,6 @@ import javax.servlet.http.HttpSession;
import org.apache.wicket.Application;
import org.apache.wicket.IPageRendererProvider;
import org.apache.wicket.Page;
-import org.apache.wicket.Response;
import org.apache.wicket.Session;
import org.apache.wicket.ThreadContext;
import org.apache.wicket.WicketRuntimeException;
@@ -38,10 +37,12 @@ import org.apache.wicket.markup.resolver
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
import org.apache.wicket.request.handler.impl.render.PageRenderer;
import org.apache.wicket.request.handler.impl.render.WebPageRenderer;
+import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.mapper.MountedMapper;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.session.HttpSessionStore;
@@ -347,7 +348,7 @@ public abstract class WebApplication ext
/**
* @see org.apache.wicket.Application#newSession(org.apache.wicket.request.Request,
- * org.apache.wicket.Response)
+ * org.apache.wicket.request.Response)
*/
@Override
public Session newSession(Request request, Response response)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java Thu Mar 18 05:28:53 2010
@@ -25,6 +25,8 @@ import org.apache.wicket.feedback.Feedba
import org.apache.wicket.feedback.IFeedbackMessageFilter;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.settings.IRequestCycleSettings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java Thu Mar 18 05:28:53 2010
@@ -35,6 +35,7 @@ import org.apache.wicket.WicketRuntimeEx
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.protocol.http.servlet.ServletWebResponse;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/EmbeddedPortletHeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/EmbeddedPortletHeaderResponse.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/EmbeddedPortletHeaderResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/EmbeddedPortletHeaderResponse.java Thu Mar 18 05:28:53 2010
@@ -20,8 +20,8 @@ import java.util.Arrays;
import java.util.List;
import org.apache.wicket.RequestContext;
-import org.apache.wicket.Response;
import org.apache.wicket.markup.html.internal.HeaderResponse;
+import org.apache.wicket.request.Response;
import org.apache.wicket.response.StringResponse;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletRequestContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletRequestContext.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletRequestContext.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletRequestContext.java Thu Mar 18 05:28:53 2010
@@ -25,11 +25,11 @@ import javax.portlet.ResourceURL;
import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.RequestContext;
-import org.apache.wicket.Response;
import org.apache.wicket.markup.html.IHeaderResponse;
-import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebResponse;
/**
* FIXME javadoc
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketFilterPortletContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketFilterPortletContext.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketFilterPortletContext.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketFilterPortletContext.java Thu Mar 18 05:28:53 2010
@@ -27,10 +27,10 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpSession;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.WebRequest;
-import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.protocol.http.WicketFilter;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
+import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.settings.IRequestCycleSettings;
import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java Thu Mar 18 05:28:53 2010
@@ -34,11 +34,11 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.protocol.http.RequestUtils;
-import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.IWritableRequestParameters;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.Url.QueryParameter;
+import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.lang.Bytes;
import org.apache.wicket.util.lang.Checks;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java Thu Mar 18 05:28:53 2010
@@ -24,8 +24,8 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.util.lang.Checks;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestablePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestablePage.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestablePage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestablePage.java Thu Mar 18 05:28:53 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.request.component;
import org.apache.wicket.page.IManageablePage;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java Thu Mar 18 05:28:53 2010
@@ -21,7 +21,6 @@ import java.util.List;
import org.apache.wicket.MetaDataEntry;
import org.apache.wicket.MetaDataKey;
-import org.apache.wicket.Response;
import org.apache.wicket.Session;
import org.apache.wicket.ThreadContext;
import org.apache.wicket.protocol.http.request.WebClientInfo;
@@ -32,6 +31,7 @@ import org.apache.wicket.request.IReques
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.RequestHandlerStack;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.UrlRenderer;
import org.apache.wicket.request.component.IRequestablePage;
@@ -39,7 +39,7 @@ import org.apache.wicket.request.handler
import org.apache.wicket.request.handler.PageProvider;
import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.lang.Checks;
import org.slf4j.Logger;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycleContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycleContext.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycleContext.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycleContext.java Thu Mar 18 05:28:53 2010
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.request.cycle;
-import org.apache.wicket.Response;
import org.apache.wicket.request.IExceptionMapper;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Response;
/**
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java (from r924632, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/EmptyAjaxRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/EmptyAjaxRequestHandler.java&r1=924632&r2=924639&rev=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/EmptyAjaxRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java Thu Mar 18 05:28:53 2010
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.request.handler.basic;
+package org.apache.wicket.request.handler;
import org.apache.wicket.Application;
-import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.http.WebResponse;
/**
* The empty AJAX request target does output an empty AJAX response.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageClassRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageClassRequestHandler.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageClassRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageClassRequestHandler.java Thu Mar 18 05:28:53 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.request.handle
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
/**
* Request handler that works with page class.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageProvider.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageProvider.java Thu Mar 18 05:28:53 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.request.handle
import org.apache.wicket.protocol.http.PageExpiredException;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.StalePageException;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java Thu Mar 18 05:28:53 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.request.handle
import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Checks;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java Thu Mar 18 05:28:53 2010
@@ -25,7 +25,7 @@ import org.apache.wicket.request.IReques
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.IPageSource;
import org.apache.wicket.request.mapper.StalePageException;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Checks;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java Thu Mar 18 05:28:53 2010
@@ -24,7 +24,7 @@ import org.apache.wicket.request.handler
import org.apache.wicket.request.handler.IPageAndComponentProvider;
import org.apache.wicket.request.handler.IPageRequestHandler;
import org.apache.wicket.request.handler.PageAndComponentProvider;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Checks;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkablePageRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkablePageRequestHandler.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkablePageRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkablePageRequestHandler.java Thu Mar 18 05:28:53 2010
@@ -20,7 +20,7 @@ import org.apache.wicket.request.IReques
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.handler.IPageClassRequestHandler;
import org.apache.wicket.request.handler.IPageProvider;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Checks;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BufferedResponseRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BufferedResponseRequestHandler.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BufferedResponseRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BufferedResponseRequestHandler.java Thu Mar 18 05:28:53 2010
@@ -17,9 +17,9 @@
package org.apache.wicket.request.handler.impl;
import org.apache.wicket.protocol.http.BufferedWebResponse;
-import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.http.WebResponse;
/**
* Handler that renders a {@link BufferedWebResponse}.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/ListenerInterfaceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/ListenerInterfaceRequestHandler.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/ListenerInterfaceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/ListenerInterfaceRequestHandler.java Thu Mar 18 05:28:53 2010
@@ -19,7 +19,6 @@ package org.apache.wicket.request.handle
import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.behavior.IBehavior;
-import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.request.component.IRequestablePage;
@@ -29,7 +28,8 @@ import org.apache.wicket.request.handler
import org.apache.wicket.request.handler.PageAndComponentProvider;
import org.apache.wicket.request.handler.PageProvider;
import org.apache.wicket.request.handler.impl.RenderPageRequestHandler.RedirectPolicy;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Checks;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java Thu Mar 18 05:28:53 2010
@@ -24,7 +24,7 @@ import org.apache.wicket.request.cycle.R
import org.apache.wicket.request.handler.IPageClassRequestHandler;
import org.apache.wicket.request.handler.IPageProvider;
import org.apache.wicket.request.handler.IPageRequestHandler;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Checks;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/render/WebPageRenderer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/render/WebPageRenderer.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/render/WebPageRenderer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/render/WebPageRenderer.java Thu Mar 18 05:28:53 2010
@@ -17,16 +17,16 @@
package org.apache.wicket.request.handler.impl.render;
import org.apache.wicket.Application;
-import org.apache.wicket.Response;
import org.apache.wicket.Session;
import org.apache.wicket.protocol.http.BufferedWebResponse;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
import org.apache.wicket.request.handler.impl.RenderPageRequestHandler.RedirectPolicy;
+import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java Thu Mar 18 05:28:53 2010
@@ -20,7 +20,7 @@ import java.util.Locale;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.lang.Checks;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java Thu Mar 18 05:28:53 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.request.handle
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.util.lang.Checks;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java Thu Mar 18 05:28:53 2010
@@ -31,7 +31,7 @@ import org.apache.wicket.request.handler
import org.apache.wicket.request.mapper.info.ComponentInfo;
import org.apache.wicket.request.mapper.info.PageComponentInfo;
import org.apache.wicket.request.mapper.info.PageInfo;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Checks;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java Thu Mar 18 05:28:53 2010
@@ -20,9 +20,9 @@ import org.apache.wicket.request.IReques
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
-import org.apache.wicket.request.mapper.parameters.IPageParametersEncoder;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
-import org.apache.wicket.request.mapper.parameters.PageParametersEncoder;
+import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.lang.WicketObjects;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java Thu Mar 18 05:28:53 2010
@@ -20,9 +20,9 @@ import org.apache.wicket.request.Request
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.info.PageComponentInfo;
-import org.apache.wicket.request.mapper.parameters.IPageParametersEncoder;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
-import org.apache.wicket.request.mapper.parameters.PageParametersEncoder;
+import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
import org.apache.wicket.util.lang.Checks;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/IPageSource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/IPageSource.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/IPageSource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/IPageSource.java Thu Mar 18 05:28:53 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.request.mapper;
import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
/**
* Interface for objects that are capable of getting and creating page instance.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java Thu Mar 18 05:28:53 2010
@@ -22,9 +22,9 @@ import org.apache.wicket.request.Request
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.info.PageComponentInfo;
-import org.apache.wicket.request.mapper.parameters.IPageParametersEncoder;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
-import org.apache.wicket.request.mapper.parameters.PageParametersEncoder;
+import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
import org.apache.wicket.util.lang.Checks;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java Thu Mar 18 05:28:53 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.request.mapper;
-import org.apache.wicket.request.mapper.parameters.IPageParametersEncoder;
-import org.apache.wicket.request.mapper.parameters.PageParametersEncoder;
+import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
+import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.IProvider;
import org.apache.wicket.util.NullProvider;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java Thu Mar 18 05:28:53 2010
@@ -24,10 +24,10 @@ import java.util.Date;
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.Application;
-import org.apache.wicket.Response;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.protocol.http.WebRequest;
-import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.request.Response;
+import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.settings.IResourceSettings;
import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.lang.Checks;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/IResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/IResource.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/IResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/IResource.java Thu Mar 18 05:28:53 2010
@@ -18,10 +18,10 @@ package org.apache.wicket.request.resour
import java.io.Serializable;
-import org.apache.wicket.Response;
import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.handler.resource.ResourceRequestHandler;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Checks;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java Thu Mar 18 05:28:53 2010
@@ -23,10 +23,10 @@ import javax.servlet.http.HttpServletRes
import org.apache.wicket.Application;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.html.IPackageResourceGuard;
-import org.apache.wicket.protocol.http.WebResponse;
-import org.apache.wicket.protocol.http.request.WebErrorCodeResponseHandler;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.handler.basic.AbortRequestHandler;
+import org.apache.wicket.request.handler.AbortRequestHandler;
+import org.apache.wicket.request.http.WebResponse;
+import org.apache.wicket.request.http.handler.ErrorCodeResponseHandler;
import org.apache.wicket.util.lang.Packages;
import org.apache.wicket.util.lang.WicketObjects;
import org.apache.wicket.util.resource.IResourceStream;
@@ -148,7 +148,7 @@ public class PackageResource implements
if (RequestCycle.get().getResponse() instanceof WebResponse)
{
RequestCycle.get().replaceAllRequestHandlers(
- new WebErrorCodeResponseHandler(HttpServletResponse.SC_NOT_FOUND, msg));
+ new ErrorCodeResponseHandler(HttpServletResponse.SC_NOT_FOUND, msg));
}
else
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/ByteArrayResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/response/ByteArrayResponse.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/response/ByteArrayResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/response/ByteArrayResponse.java Thu Mar 18 05:28:53 2010
@@ -19,8 +19,8 @@ package org.apache.wicket.response;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import org.apache.wicket.Response;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.request.Response;
/**
@@ -59,7 +59,7 @@ public class ByteArrayResponse extends R
}
/**
- * @see org.apache.wicket.Response#write(CharSequence)
+ * @see org.apache.wicket.request.Response#write(CharSequence)
*/
@Override
public void write(final CharSequence string)
@@ -75,7 +75,7 @@ public class ByteArrayResponse extends R
}
/**
- * @see org.apache.wicket.Response#reset()
+ * @see org.apache.wicket.request.Response#reset()
*/
@Override
public void reset()
@@ -85,7 +85,7 @@ public class ByteArrayResponse extends R
/**
- * @see org.apache.wicket.Response#getOutputStream()
+ * @see org.apache.wicket.request.Response#getOutputStream()
*/
@Override
public void write(byte[] array)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/NullResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/response/NullResponse.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/response/NullResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/response/NullResponse.java Thu Mar 18 05:28:53 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.response;
-import org.apache.wicket.Response;
+import org.apache.wicket.request.Response;
/**
@@ -45,7 +45,7 @@ public class NullResponse extends Respon
}
/**
- * @see org.apache.wicket.Response#write(CharSequence)
+ * @see org.apache.wicket.request.Response#write(CharSequence)
*/
@Override
public void write(CharSequence string)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/StringResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/response/StringResponse.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/response/StringResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/response/StringResponse.java Thu Mar 18 05:28:53 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.response;
-import org.apache.wicket.Response;
+import org.apache.wicket.request.Response;
import org.apache.wicket.util.string.AppendingStringBuffer;
@@ -42,7 +42,7 @@ public class StringResponse extends Resp
}
/**
- * @see org.apache.wicket.Response#write(CharSequence)
+ * @see org.apache.wicket.request.Response#write(CharSequence)
*/
@Override
public void write(final CharSequence string)
@@ -51,7 +51,7 @@ public class StringResponse extends Resp
}
/**
- * @see org.apache.wicket.Response#reset()
+ * @see org.apache.wicket.request.Response#reset()
*/
@Override
public void reset()
@@ -77,7 +77,7 @@ public class StringResponse extends Resp
}
/**
- * @see org.apache.wicket.Response#getOutputStream()
+ * @see org.apache.wicket.request.Response#getOutputStream()
*/
@Override
public void write(byte[] array)
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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -20,14 +20,14 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.Map;
-import org.apache.wicket.AbortException;
import org.apache.wicket.IPageFactory;
import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.authorization.AuthorizationException;
import org.apache.wicket.markup.MarkupException;
+import org.apache.wicket.request.RequestHandlerStack.ReplaceHandlerException;
import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Generics;
@@ -152,7 +152,7 @@ public final class DefaultPageFactory im
if (argument != null)
return (Page)constructor.newInstance(new Object[] { argument });
else
- return (Page)constructor.newInstance(new Object[] {});
+ return (Page)constructor.newInstance(new Object[] { });
}
catch (InstantiationException e)
{
@@ -164,7 +164,7 @@ public final class DefaultPageFactory im
}
catch (InvocationTargetException e)
{
- if (e.getTargetException() instanceof AbortException ||
+ if (e.getTargetException() instanceof ReplaceHandlerException ||
e.getTargetException() instanceof AuthorizationException ||
e.getTargetException() instanceof MarkupException)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java Thu Mar 18 05:28:53 2010
@@ -20,10 +20,10 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.markup.html.form.FormComponent;
-import org.apache.wicket.protocol.http.WebRequest;
-import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Time;
import org.slf4j.Logger;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStreamWriter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStreamWriter.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStreamWriter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStreamWriter.java Thu Mar 18 05:28:53 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.util.resource;
-import org.apache.wicket.Response;
+import org.apache.wicket.request.Response;
/**
* Special IResourceStream implementation that a Resource can return when it directly wants to write
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java Thu Mar 18 05:28:53 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.util.string;
-import org.apache.wicket.Response;
+import org.apache.wicket.request.Response;
/**
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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -95,7 +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.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -17,7 +17,7 @@
package org.apache.wicket;
import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -19,7 +19,7 @@ package org.apache.wicket;
import junit.framework.TestCase;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.WicketTester;
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java Thu Mar 18 05:28:53 2010
@@ -17,7 +17,6 @@
package org.apache.wicket.ajax;
import org.apache.wicket.Component;
-import org.apache.wicket.Response;
import org.apache.wicket.Session;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.authorization.Action;
@@ -25,6 +24,7 @@ import org.apache.wicket.authorization.I
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Response;
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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.autolink;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.PackageResourceReference;
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java Thu Mar 18 05:28:53 2010
@@ -20,7 +20,6 @@ import junit.framework.TestCase;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
-import org.apache.wicket.Response;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.Session;
import org.apache.wicket.authorization.Action;
@@ -28,6 +27,7 @@ import org.apache.wicket.authorization.I
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Response;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTester;
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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
/**
* @author jcompagner
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.validation.validator.StringValidator;
/**
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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -24,8 +24,8 @@ import org.apache.wicket.markup.html.lis
import org.apache.wicket.markup.html.list.ListView;
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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.http.flow.AbortWithHttpErrorCodeException;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
/**
* Page that optionally throws an abortexception during render phase.
@@ -42,7 +42,7 @@ public class AbortExceptionPage extends
if (!triggerError)
{
- throw new AbortWithWebErrorCodeException(1234, "this error will be rendered");
+ throw new AbortWithHttpErrorCodeException(1234, "this error will be rendered");
}
IModel<List<Object>> model = new LoadableDetachableModel<List<Object>>()
@@ -54,7 +54,7 @@ public class AbortExceptionPage extends
{
if (triggerError)
{
- throw new AbortWithWebErrorCodeException(1234,
+ throw new AbortWithHttpErrorCodeException(1234,
"this error will NOT be rendered");
}
else
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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -19,8 +19,8 @@ package org.apache.wicket.redirect.abort
import junit.framework.Assert;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.protocol.http.servlet.AbortWithWebErrorCodeException;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.http.flow.AbortWithHttpErrorCodeException;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
/**
* Testcase for WICKET-1418, throwing an abortexception during rendering.
@@ -56,7 +56,7 @@ public class AbortExceptionTest extends
{
final Throwable reason = x.getCause();
- Assert.assertEquals(reason.getClass(), AbortWithWebErrorCodeException.class);
+ Assert.assertEquals(reason.getClass(), AbortWithHttpErrorCodeException.class);
Assert.fail("this must not happen (we expect a redirect happen here and handled by wicket request processor)");
}
}
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=924639&r1=924638&r2=924639&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 05:28:53 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.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.redirect.encodingtest;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.redirect.encod
import junit.framework.TestCase;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -18,10 +18,10 @@ package org.apache.wicket.request.cycle;
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;
+import org.apache.wicket.request.Response;
/**
*
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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -21,7 +21,7 @@ import java.util.Locale;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -33,7 +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;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -34,7 +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;
+import org.apache.wicket.request.mapper.parameter.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=924639&r1=924638&r2=924639&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 05:28:53 2010
@@ -23,7 +23,7 @@ import org.apache.wicket.RequestListener
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.IMapperContext;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.request.resource.ResourceReferenceRegistry;