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 [2/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-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java Thu Mar 18 05:28:53 2010
@@ -22,10 +22,10 @@ import java.util.List;
import javax.swing.tree.TreeNode;
import org.apache.wicket.Component;
-import org.apache.wicket.Response;
import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Alignment;
import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Unit;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.cycle.RequestCycle;
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=924639&r1=924638&r2=924639&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 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-request/src/main/java/org/apache/wicket/request/IRequestCycle.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/IRequestCycle.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/IRequestCycle.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/IRequestCycle.java Thu Mar 18 05:28:53 2010
@@ -1,10 +1,11 @@
package org.apache.wicket.request;
-import org.apache.wicket.Response;
public interface IRequestCycle
{
Response getResponse();
Request getRequest();
void scheduleRequestHandlerAfterCurrent(IRequestHandler handler);
+ UrlRenderer getUrlRenderer();
+
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java Thu Mar 18 05:28:53 2010
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import org.apache.wicket.Response;
import org.apache.wicket.util.lang.Exceptions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Response.java (from r924375, wicket/trunk/wicket-request/src/main/java/org/apache/wicket/Response.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Response.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Response.java&p1=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/Response.java&r1=924375&r2=924639&rev=924639&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/Response.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Response.java Thu Mar 18 05:28:53 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket;
+package org.apache.wicket.request;
/**
* Abstract base class for different implementations of response writing.
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlDecoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlDecoder.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlDecoder.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlDecoder.java Thu Mar 18 05:28:53 2010
@@ -19,9 +19,6 @@ package org.apache.wicket.request;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Adapted from java.net.URLDecoder, but defines instances for query string
* decoding versus URL path component decoding.
@@ -36,8 +33,6 @@ import org.slf4j.LoggerFactory;
*/
public class UrlDecoder
{
- private static final Logger log = LoggerFactory.getLogger(UrlDecoder.class);
-
private final boolean decodePlus;
/**
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java Thu Mar 18 05:28:53 2010
@@ -23,9 +23,6 @@ import java.nio.charset.IllegalCharsetNa
import java.nio.charset.UnsupportedCharsetException;
import java.util.BitSet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Adapted from java.net.URLEncoder, but defines instances for query string
* encoding versus URL path component encoding.
@@ -40,8 +37,6 @@ import org.slf4j.LoggerFactory;
*/
public class UrlEncoder
{
- private static final Logger log = LoggerFactory.getLogger(UrlEncoder.class);
-
/**
* encoder types
*/
Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java (from r924632, wicket/trunk/wicket/src/main/java/org/apache/wicket/AbstractRestartResponseException.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/AbstractRestartResponseException.java&r1=924632&r2=924639&rev=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/AbstractRestartResponseException.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java Thu Mar 18 05:28:53 2010
@@ -14,18 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket;
+package org.apache.wicket.request.flow;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.RequestHandlerStack.ReplaceHandlerException;
/**
- * An exception that causes the request cycle to immediately switch to respond stage.
+ * An exception that resets the response before executing the specified request
+ * handler
*
* @author Igor Vaynberg (ivaynberg)
* @author Jonathan Locke
*/
-public abstract class AbstractRestartResponseException extends AbortException
+public abstract class ResetResponseException extends ReplaceHandlerException
{
/**
*
@@ -35,9 +37,9 @@ public abstract class AbstractRestartRes
/**
* Construct.
*/
- protected AbstractRestartResponseException(IRequestHandler handler)
+ protected ResetResponseException(IRequestHandler handler)
{
- super(new ResponseResettingDecorator(handler));
+ super(new ResponseResettingDecorator(handler), true);
}
private static class ResponseResettingDecorator implements IRequestHandler
Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/AbortRequestHandler.java (from r924632, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/AbortRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/AbortRequestHandler.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/AbortRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/AbortRequestHandler.java&r1=924632&r2=924639&rev=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/AbortRequestHandler.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/AbortRequestHandler.java Thu Mar 18 05:28:53 2010
@@ -14,7 +14,7 @@
* 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.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
@@ -28,7 +28,7 @@ public class AbortRequestHandler impleme
public void respond(IRequestCycle requestCycle)
{
- // TODO
+ // TODO matej: what to do here???
}
}
Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/AbortRequestHandler.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java (from r924632, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/EmptyRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/EmptyRequestHandler.java&r1=924632&r2=924639&rev=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/EmptyRequestHandler.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java Thu Mar 18 05:28:53 2010
@@ -14,43 +14,27 @@
* 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.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
/**
- * The empty request target does nothing in itself but instead relies on some other source to
- * generate a response. It can be regarded as a dummy implementation.
+ * Request handler that performs no work
*
+ * @author igor.vaynberg
* @author Eelco Hillenius
*/
public final class EmptyRequestHandler implements IRequestHandler
{
- /** immutable hashcode. */
- private static final int HASH = 17 * 3214424;
-
- /** singleton instance. */
- private static final EmptyRequestHandler instance = new EmptyRequestHandler();
-
/**
* Construct.
*/
- private EmptyRequestHandler()
+ public EmptyRequestHandler()
{
}
/**
- * Gets the singleton instance.
- *
- * @return the singleton instance
- */
- public static final EmptyRequestHandler getInstance()
- {
- return instance;
- }
-
- /**
* Does nothing at all.
*
* @see org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
@@ -66,34 +50,4 @@ public final class EmptyRequestHandler i
{
}
- /**
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj)
- {
- if (obj instanceof EmptyRequestHandler)
- {
- return true;
- }
- return false;
- }
-
- /**
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode()
- {
- return HASH;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return "EmptyRequestTarget";
- }
}
Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java (from r924632, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/StringRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/StringRequestHandler.java&r1=924632&r2=924639&rev=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/StringRequestHandler.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java Thu Mar 18 05:28:53 2010
@@ -14,24 +14,24 @@
* 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 java.io.IOException;
+import java.nio.charset.Charset;
-import org.apache.wicket.Application;
-import org.apache.wicket.WicketRuntimeException;
-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;
import org.apache.wicket.util.string.Strings;
/**
* Request target that responds by sending its string property.
*
+ * @author igor.vaynberg
* @author Eelco Hillenius
*/
-public class StringRequestHandler implements IRequestHandler
+public class TextRequestHandler implements IRequestHandler
{
/** the string for the response. */
private final String string;
@@ -44,15 +44,15 @@ public class StringRequestHandler implem
/**
- * Creates a string request target with content type <code>text/plain</code> and default charset
- * (usually UTF-8)
+ * Creates a string request target with content type <code>text/plain</code>
+ * and default charset (usually UTF-8)
*
* @param string
* the string for the response
*/
- public StringRequestHandler(String string)
+ public TextRequestHandler(String string)
{
- this("text/plain", getDefaultEncoding(), string);
+ this("text/plain", null, string);
}
/**
@@ -66,7 +66,7 @@ public class StringRequestHandler implem
* @param string
* string for the response
*/
- public StringRequestHandler(String contentType, String encoding, String string)
+ public TextRequestHandler(String contentType, String encoding, String string)
{
if (string == null)
{
@@ -85,16 +85,6 @@ public class StringRequestHandler implem
this.encoding = encoding;
}
- /**
- * Retrieves default charset configured in application
- *
- * @return charset
- */
- private static String getDefaultEncoding()
- {
- return Application.get().getRequestCycleSettings().getResponseRequestEncoding();
- }
-
/**
* Responds by sending the string property.
@@ -103,6 +93,8 @@ public class StringRequestHandler implem
*/
public void respond(IRequestCycle requestCycle)
{
+ String encoding = getEncoding(requestCycle);
+
// Get servlet response to use when responding with resource
final WebResponse response = (WebResponse)requestCycle.getResponse();
response.setContentType(contentType + ";charset=" + encoding);
@@ -114,11 +106,29 @@ public class StringRequestHandler implem
}
catch (IOException e)
{
- throw new WicketRuntimeException("Unable to render string: " + e.getMessage(), e);
+ throw new RuntimeException("Unable to render string: " + e.getMessage(), e);
}
}
/**
+ * @param requestCycle
+ * @return
+ */
+ private String getEncoding(IRequestCycle requestCycle)
+ {
+ String encoding = this.encoding;
+ if (Strings.isEmpty(encoding))
+ {
+ Charset charset = requestCycle.getRequest().getCharset();
+ if (charset != null)
+ {
+ encoding = charset.name();
+ }
+ }
+ return encoding;
+ }
+
+ /**
* @see org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
*/
public void detach(IRequestCycle requestCycle)
@@ -135,37 +145,5 @@ public class StringRequestHandler implem
return string;
}
- /**
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj)
- {
- if (obj instanceof StringRequestHandler)
- {
- StringRequestHandler that = (StringRequestHandler)obj;
- return string.equals(that.string);
- }
- return false;
- }
-
- /**
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode()
- {
- int result = "StringRequestTarget".hashCode();
- result += string.hashCode();
- return 17 * result;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return "[StringRequestTarget@" + hashCode() + " " + string + "]";
- }
+
}
Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java (from r924578, wicket/trunk/wicket-request/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/request/http/WebRequest.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java&p1=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebRequest.java&r1=924578&r2=924639&rev=924639&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebRequest.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java Thu Mar 18 05:28:53 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.http;
import java.nio.charset.Charset;
import java.util.Date;
Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java (from r924578, wicket/trunk/wicket-request/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/request/http/WebResponse.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java&p1=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebResponse.java&r1=924578&r2=924639&rev=924639&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/protocol/http/WebResponse.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java Thu Mar 18 05:28:53 2010
@@ -14,13 +14,13 @@
* 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.http;
import java.io.IOException;
import javax.servlet.http.Cookie;
-import org.apache.wicket.Response;
+import org.apache.wicket.request.Response;
import org.apache.wicket.util.string.Strings;
@@ -107,7 +107,7 @@ public abstract class WebResponse extend
}
/**
- * Convenience method for setting the content-disposition:in;ine header. This header is used if
+ * Convenience method for setting the content-disposition:inline header. This header is used if
* the response should be shown embedded in browser window while having custom file name when
* user saves the response. browser.
*
Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/flow/AbortWithHttpErrorCodeException.java (from r924632, wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/flow/AbortWithHttpErrorCodeException.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/flow/AbortWithHttpErrorCodeException.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java&r1=924632&r2=924639&rev=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/flow/AbortWithHttpErrorCodeException.java Thu Mar 18 05:28:53 2010
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.protocol.http.servlet;
+package org.apache.wicket.request.http.flow;
import javax.servlet.http.HttpServletResponse;
-import org.apache.wicket.AbortException;
-import org.apache.wicket.AbstractRestartResponseException;
-import org.apache.wicket.protocol.http.request.WebErrorCodeResponseHandler;
+import org.apache.wicket.request.flow.ResetResponseException;
+import org.apache.wicket.request.http.handler.ErrorCodeResponseHandler;
/**
* Causes Wicket to abort processing and set the specified HTTP error code, with the provided
@@ -28,9 +27,8 @@ import org.apache.wicket.protocol.http.r
*
* @author igor.vaynberg
*
- * @see AbortException
*/
-public final class AbortWithWebErrorCodeException extends AbstractRestartResponseException
+public final class AbortWithHttpErrorCodeException extends ResetResponseException
{
private static final long serialVersionUID = 1L;
@@ -45,9 +43,9 @@ public final class AbortWithWebErrorCode
* {@link javax.servlet.http.HttpServletResponse} constants
* @see javax.servlet.http.HttpServletResponse
*/
- public AbortWithWebErrorCodeException(int errorCode, String message)
+ public AbortWithHttpErrorCodeException(int errorCode, String message)
{
- super(new WebErrorCodeResponseHandler(errorCode, message));
+ super(new ErrorCodeResponseHandler(errorCode, message));
this.errorCode = errorCode;
this.message = message;
}
Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/flow/AbortWithHttpErrorCodeException.java
------------------------------------------------------------------------------
svn:executable = *
Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeResponseHandler.java (from r924632, wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebErrorCodeResponseHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeResponseHandler.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeResponseHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebErrorCodeResponseHandler.java&r1=924632&r2=924639&rev=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebErrorCodeResponseHandler.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeResponseHandler.java Thu Mar 18 05:28:53 2010
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.protocol.http.request;
+package org.apache.wicket.request.http.handler;
-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;
/**
@@ -28,7 +28,7 @@ import org.apache.wicket.request.IReques
*
* @author Eelco Hillenius
*/
-public final class WebErrorCodeResponseHandler implements IRequestHandler
+public final class ErrorCodeResponseHandler implements IRequestHandler
{
/** the servlet error code. */
private final int errorCode;
@@ -44,7 +44,7 @@ public final class WebErrorCodeResponseH
* {@link javax.servlet.http.HttpServletResponse} constants
* @see javax.servlet.http.HttpServletResponse
*/
- public WebErrorCodeResponseHandler(int errorCode)
+ public ErrorCodeResponseHandler(int errorCode)
{
this(errorCode, null);
}
@@ -59,7 +59,7 @@ public final class WebErrorCodeResponseH
* the optional message to send to the client
* @see javax.servlet.http.HttpServletResponse
*/
- public WebErrorCodeResponseHandler(int errorCode, String message)
+ public ErrorCodeResponseHandler(int errorCode, String message)
{
this.errorCode = errorCode;
this.message = message;
@@ -102,51 +102,4 @@ public final class WebErrorCodeResponseH
public void detach(IRequestCycle requestCycle)
{
}
-
- /**
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj)
- {
- boolean equal = false;
- if (obj instanceof WebErrorCodeResponseHandler)
- {
- WebErrorCodeResponseHandler that = (WebErrorCodeResponseHandler)obj;
- if (errorCode == that.errorCode)
- {
- if (message != null)
- {
- equal = (that.message != null && message.equals(that.message));
- }
- else
- {
- equal = (that.message == null);
- }
- }
- }
- return equal;
- }
-
- /**
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode()
- {
- int result = "WebErrorCodeResponseTarget".hashCode();
- result += message != null ? message.hashCode() : 0;
- result += errorCode;
- return 17 * result;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return "[WebErrorCodeResponseTarget@" + hashCode() + " errorCode=" + getErrorCode() +
- ((message != null) ? " (" + message + ")" : "" + "]");
- }
}
Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeResponseHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeResponseHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java (from r924632, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/RedirectRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java?p2=wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/RedirectRequestHandler.java&r1=924632&r2=924639&rev=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/RedirectRequestHandler.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java Thu Mar 18 05:28:53 2010
@@ -14,48 +14,56 @@
* 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.http.handler;
-import org.apache.wicket.RequestContext;
-import org.apache.wicket.markup.html.pages.RedirectPage;
-import org.apache.wicket.protocol.http.WebResponse;
-import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.util.string.UrlUtils;
+import org.apache.wicket.request.http.WebResponse;
/**
- * A RequestTarget that will send a redirect url to the browser. Use this if you want to direct the
- * browser to some external URL, like Google etc, immediately. Or if you want to redirect to a
- * Wicket page.
+ * A request handler that redirects to the given url.
*
- * If you want to redirect with a delay the {@link RedirectPage} will do a meta tag redirect with a
- * delay.
+ * the url should be one of the following:
+ * <ul>
+ * <li>Fully qualified "http://foo.com/bar"</li>
+ * <li>Relative to the Wicket filter/servlet, e.g. "?wicket:interface=foo",
+ * "mounted_page"</li>
+ * <li>Absolute within your web application's <strong>context root</strong>,
+ * e.g. "/foo.html"</li>
+ * </ul>
*
- * @see RedirectPageRequestTarget
+ * @author igor.vaynberg
* @author jcompagner
*/
public class RedirectRequestHandler implements IRequestHandler
{
private final String redirectUrl;
+ private final int status;
/**
- * Your URL should be one of the following:
- * <ul>
- * <li>Fully qualified "http://foo.com/bar"</li>
- * <li>Relative to the Wicket filter/servlet, e.g. "?wicket:interface=foo", "mounted_page"</li>
- * <li>Absolute within your web application's context root, e.g. "/foo.html"</li>
- * </ul>
- *
* @param redirectUrl
* URL to redirect to.
*/
public RedirectRequestHandler(String redirectUrl)
{
- this.redirectUrl = redirectUrl;
+ this(redirectUrl, 302);
+ }
+ /**
+ * @param redirectUrl
+ * URL to redirect to.
+ * @param status
+ * 301 or 302
+ */
+ public RedirectRequestHandler(String redirectUrl, int status)
+ {
+ if (status != 301 && status != 302)
+ {
+ throw new IllegalStateException("Status must be either 301 or 302, but was: " + status);
+ }
+ this.redirectUrl = redirectUrl;
+ this.status = status;
}
/**
@@ -72,39 +80,36 @@ public class RedirectRequestHandler impl
*/
public void respond(IRequestCycle requestCycle)
{
- WebResponse response = (WebResponse)requestCycle.getResponse();
+ final String location;
if (redirectUrl.startsWith("/"))
{
// context-absolute url
-
- RequestContext rc = RequestContext.get();
- if (rc.isPortletRequest() && ((PortletRequestContext)rc).isEmbedded())
- {
- response.sendRedirect(redirectUrl);
- }
- else
- {
- String location = UrlUtils.rewriteToContextRelative(redirectUrl.substring(1),
- (RequestCycle)requestCycle);
-
- // IE does not understand "./" in a path, just "." is okay.
- if (location.startsWith("./"))
- {
- location = location.length() == 2 ? "." : location.substring(2);
- }
- response.sendRedirect(location);
- }
+ location = requestCycle.getUrlRenderer().renderContextPathRelativeUrl(redirectUrl,
+ requestCycle.getRequest());
}
else if (redirectUrl.contains("://"))
{
// absolute url
- response.sendRedirect(redirectUrl);
+ location = redirectUrl;
+ }
+ else
+ {
+ // relative url, servlet container will translate to absolute per as
+ // per the servlet spec
+ location = redirectUrl;
+ }
+
+ WebResponse response = (WebResponse)requestCycle.getResponse();
+
+ if (status == 302)
+ {
+ response.sendRedirect(location);
}
else
{
- // relative url
- response.sendRedirect(redirectUrl);
+ response.setStatus(301);
+ response.setHeader("Location", location);
}
}
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java Thu Mar 18 05:28:53 2010
@@ -21,8 +21,8 @@ import org.apache.wicket.request.IReques
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.Url.QueryParameter;
-import org.apache.wicket.request.mapper.parameters.IPageParametersEncoder;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.Strings;
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/IPageParametersEncoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/IPageParametersEncoder.java?rev=924639&r1=924578&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/IPageParametersEncoder.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/IPageParametersEncoder.java Thu Mar 18 05:28:53 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.request.mapper.parameters;
+package org.apache.wicket.request.mapper.parameter;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java?rev=924639&r1=924578&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java Thu Mar 18 05:28:53 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.request.mapper.parameters;
+package org.apache.wicket.request.mapper.parameter;
import java.io.Serializable;
import java.util.ArrayList;
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java?rev=924639&r1=924578&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java Thu Mar 18 05:28:53 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.request.mapper.parameters;
+package org.apache.wicket.request.mapper.parameter;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
@@ -35,7 +35,7 @@ public class PageParametersEncoder imple
}
/**
- * @see org.apache.wicket.request.mapper.parameters.IPageParametersEncoder#decodePageParameters(org.apache.wicket.request.Request)
+ * @see org.apache.wicket.request.mapper.parameter.IPageParametersEncoder#decodePageParameters(org.apache.wicket.request.Request)
*/
public PageParameters decodePageParameters(Request request)
{
@@ -57,7 +57,7 @@ public class PageParametersEncoder imple
}
/**
- * @see org.apache.wicket.request.mapper.parameters.IPageParametersEncoder#encodePageParameters(org.apache.wicket.request.mapper.parameters.PageParameters)
+ * @see org.apache.wicket.request.mapper.parameter.IPageParametersEncoder#encodePageParameters(org.apache.wicket.request.mapper.parameter.PageParameters)
*/
public Url encodePageParameters(PageParameters pageParameters)
{
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java Thu Mar 18 05:28:53 2010
@@ -23,6 +23,7 @@ public class Exceptions
});
}
+ // TODO Component$IVisitor should utilize a similar object, much cleaner than magic return values
public static class Traversal<T>
{
private T result;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java Thu Mar 18 05:28:53 2010
@@ -62,13 +62,14 @@ import org.apache.wicket.protocol.http.W
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.component.IRequestablePage;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.cycle.RequestCycleContext;
import org.apache.wicket.request.mapper.CompoundRequestMapper;
import org.apache.wicket.request.mapper.ICompoundRequestMapper;
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.ResourceReferenceRegistry;
import org.apache.wicket.session.DefaultPageFactory;
import org.apache.wicket.session.ISessionStore;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Thu Mar 18 05:28:53 2010
@@ -47,9 +47,9 @@ import org.apache.wicket.model.IComponen
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.IModelComparator;
import org.apache.wicket.model.IWrapModel;
-import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.handler.PageAndComponentProvider;
@@ -58,7 +58,8 @@ import org.apache.wicket.request.handler
import org.apache.wicket.request.handler.impl.BookmarkablePageRequestHandler;
import org.apache.wicket.request.handler.impl.ListenerInterfaceRequestHandler;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
-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.request.resource.ResourceReference;
import org.apache.wicket.settings.IDebugSettings;
import org.apache.wicket.util.convert.IConverter;
@@ -2574,12 +2575,12 @@ public abstract class Component implemen
}
}
}
+ catch (WicketRuntimeException wre)
+ {
+ throw wre;
+ }
catch (RuntimeException re)
{
- if (re instanceof WicketRuntimeException || re instanceof AbortException)
- {
- throw re;
- }
throw new WicketRuntimeException("Exception in rendering component: " + this, re);
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/IPageFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/IPageFactory.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/IPageFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/IPageFactory.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;
/**
@@ -25,7 +25,7 @@ import org.apache.wicket.request.mapper.
* PageParameters argument to pass to the Page's constructor.
* <p>
* IMPORTANT NOTE: Implementations must let subclasses of
- * {@link org.apache.wicket.AbstractRestartResponseException} thrown from the constructing page's
+ * {@link org.apache.wicket.request.flow.ResetResponseException} thrown from the constructing page's
* constructor bubble up.
*
* @see org.apache.wicket.settings.ISessionSettings#setPageFactory(IPageFactory)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java Thu Mar 18 05:28:53 2010
@@ -38,10 +38,10 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.resolver.IComponentResolver;
import org.apache.wicket.model.IModel;
import org.apache.wicket.page.IManageablePage;
-import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.http.WebResponse;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.session.ISessionStore;
import org.apache.wicket.settings.IDebugSettings;
import org.apache.wicket.util.lang.Classes;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java Thu Mar 18 05:28:53 2010
@@ -28,12 +28,13 @@ import org.apache.wicket.request.IWritab
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.flow.ResetResponseException;
import org.apache.wicket.request.handler.PageProvider;
-import org.apache.wicket.request.handler.basic.RedirectRequestHandler;
import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
+import org.apache.wicket.request.http.handler.RedirectRequestHandler;
import org.apache.wicket.util.string.StringValue;
-public class RestartResponseAtInterceptPageException extends AbstractRestartResponseException
+public class RestartResponseAtInterceptPageException extends ResetResponseException
{
public RestartResponseAtInterceptPageException(Page interceptPage)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseException.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseException.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseException.java Thu Mar 18 05:28:53 2010
@@ -17,9 +17,10 @@
package org.apache.wicket;
import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.flow.ResetResponseException;
import org.apache.wicket.request.handler.PageProvider;
import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
/**
* Causes wicket to interrupt current request processing and immediately respond with the specified
@@ -27,7 +28,7 @@ import org.apache.wicket.request.mapper.
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class RestartResponseException extends AbstractRestartResponseException
+public class RestartResponseException extends ResetResponseException
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/SystemMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/SystemMapper.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/SystemMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/SystemMapper.java Thu Mar 18 05:28:53 2010
@@ -22,7 +22,7 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.request.mapper.HomePageMapper;
import org.apache.wicket.request.mapper.PageInstanceMapper;
import org.apache.wicket.request.mapper.ResourceReferenceMapper;
-import org.apache.wicket.request.mapper.parameters.PageParametersEncoder;
+import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
import org.apache.wicket.util.IProvider;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java Thu Mar 18 05:28:53 2010
@@ -18,8 +18,8 @@ package org.apache.wicket.ajax;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.IHeaderResponse;
-import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.util.time.Duration;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java Thu Mar 18 05:28:53 2010
@@ -24,9 +24,9 @@ import org.apache.wicket.behavior.Abstra
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WicketEventReference;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.resource.JavascriptResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java Thu Mar 18 05:28:53 2010
@@ -32,24 +32,24 @@ import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
-import org.apache.wicket.Response;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.internal.HeaderResponse;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
import org.apache.wicket.markup.parser.filter.HtmlHeaderSectionHandler;
import org.apache.wicket.markup.repeater.AbstractRepeater;
-import org.apache.wicket.protocol.http.WebRequest;
-import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
+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.IPageRequestHandler;
import org.apache.wicket.request.handler.PageProvider;
import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.http.WebResponse;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
@@ -162,7 +162,7 @@ public class AjaxRequestTarget implement
}
/**
- * @see org.apache.wicket.Response#encodeURL(CharSequence)
+ * @see org.apache.wicket.request.Response#encodeURL(CharSequence)
*/
@Override
public String encodeURL(CharSequence url)
@@ -187,7 +187,7 @@ public class AjaxRequestTarget implement
}
/**
- * @see org.apache.wicket.Response#write(CharSequence)
+ * @see org.apache.wicket.request.Response#write(CharSequence)
*/
@Override
public void write(CharSequence cs)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java Thu Mar 18 05:28:53 2010
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.ajax.form;
-import org.apache.wicket.Response;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.FormComponent;
+import org.apache.wicket.request.Response;
import org.apache.wicket.util.string.JavascriptUtils;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java Thu Mar 18 05:28:53 2010
@@ -18,8 +18,8 @@ package org.apache.wicket.behavior;
import org.apache.wicket.Component;
import org.apache.wicket.RequestListenerInterface;
-import org.apache.wicket.Response;
import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.request.Response;
/**
* Abstract class for handling Ajax roundtrips. This class serves as a base for javascript specific
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java Thu Mar 18 05:28:53 2010
@@ -25,11 +25,11 @@ import java.util.List;
import java.util.Map;
import org.apache.wicket.Component;
-import org.apache.wicket.Response;
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.markup.parser.XmlTag;
import org.apache.wicket.markup.parser.XmlTag.Type;
import org.apache.wicket.markup.parser.filter.HtmlHandler;
+import org.apache.wicket.request.Response;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java Thu Mar 18 05:28:53 2010
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.markup.html;
-import org.apache.wicket.Response;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.behavior.AbstractBehavior;
import org.apache.wicket.markup.ComponentTag;
@@ -26,6 +25,7 @@ import org.apache.wicket.markup.MarkupSt
import org.apache.wicket.markup.TagUtils;
import org.apache.wicket.markup.WicketTag;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
+import org.apache.wicket.request.Response;
import org.apache.wicket.response.NullResponse;
import org.apache.wicket.util.lang.Classes;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java Thu Mar 18 05:28:53 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html;
-import org.apache.wicket.Response;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.resource.ResourceReference;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java Thu Mar 18 05:28:53 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.html;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.protocol.http.WebRequest;
+import org.apache.wicket.request.http.WebRequest;
/**
* A container of HTML markup and components. It is very similar to the base class MarkupContainer,
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java Thu Mar 18 05:28:53 2010
@@ -19,17 +19,17 @@ package org.apache.wicket.markup.html;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
-import org.apache.wicket.Response;
import org.apache.wicket.behavior.AbstractBehavior;
import org.apache.wicket.markup.MarkupType;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.parser.filter.HtmlHeaderSectionHandler;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.handler.IPageRequestHandler;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.http.WebResponse;
+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.response.StringResponse;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java Thu Mar 18 05:28:53 2010
@@ -22,7 +22,6 @@ import java.util.Locale;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Response;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.behavior.AbstractBehavior;
import org.apache.wicket.markup.ContainerInfo;
@@ -33,6 +32,7 @@ import org.apache.wicket.markup.MarkupRe
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.WicketTag;
import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
+import org.apache.wicket.request.Response;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.locator.IResourceStreamLocator;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java Thu Mar 18 05:28:53 2010
@@ -25,7 +25,6 @@ import java.util.Map;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
-import org.apache.wicket.Response;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
@@ -36,13 +35,14 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.validation.IFormValidator;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.UrlDecoder;
-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.settings.IApplicationSettings;
import org.apache.wicket.util.lang.Bytes;
import org.apache.wicket.util.string.AppendingStringBuffer;
@@ -1542,7 +1542,7 @@ public class Form<T> extends WebMarkupCo
/**
* @see org.apache.wicket.Component#renderPlaceholderTag(org.apache.wicket.markup.ComponentTag,
- * org.apache.wicket.Response)
+ * org.apache.wicket.request.Response)
*/
@Override
protected void renderPlaceholderTag(ComponentTag tag, Response response)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java Thu Mar 18 05:28:53 2010
@@ -21,7 +21,7 @@ import org.apache.wicket.markup.Componen
import org.apache.wicket.markup.html.image.resource.LocalizedImageResource;
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;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java Thu Mar 18 05:28:53 2010
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.html.image.resource.LocalizedImageResource;
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;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java Thu Mar 18 05:28:53 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.im
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
-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.value.ValueMap;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java Thu Mar 18 05:28:53 2010
@@ -28,7 +28,7 @@ import org.apache.wicket.markup.Componen
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
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.IResource;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java Thu Mar 18 05:28:53 2010
@@ -18,7 +18,6 @@ package org.apache.wicket.markup.html.in
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Response;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.application.IComponentOnAfterRenderListener;
import org.apache.wicket.markup.ComponentTag;
@@ -30,6 +29,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.IFormSubmittingComponent;
import org.apache.wicket.markup.parser.filter.EnclosureHandler;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.response.NullResponse;
import org.slf4j.Logger;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java Thu Mar 18 05:28:53 2010
@@ -22,10 +22,10 @@ import java.util.List;
import java.util.Set;
import org.apache.wicket.Application;
-import org.apache.wicket.Response;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WicketEventReference;
import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.resource.ResourceReference;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java Thu Mar 18 05:28:53 2010
@@ -23,7 +23,6 @@ import java.util.Map;
import org.apache.wicket.Component;
import org.apache.wicket.RequestContext;
-import org.apache.wicket.Response;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.IMarkupFragment;
@@ -33,6 +32,7 @@ import org.apache.wicket.markup.WicketTa
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
import org.apache.wicket.markup.renderStrategy.AbstractHeaderRenderStrategy;
+import org.apache.wicket.request.Response;
import org.apache.wicket.response.StringResponse;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/ResponseBufferZone.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/ResponseBufferZone.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/ResponseBufferZone.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/ResponseBufferZone.java Thu Mar 18 05:28:53 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.html.internal;
-import org.apache.wicket.Response;
import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.response.StringResponse;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java Thu Mar 18 05:28:53 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.Page;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.WicketObjects;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java Thu Mar 18 05:28:53 2010
@@ -20,7 +20,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.Session;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
-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/markup/html/link/ResourceLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java Thu Mar 18 05:28:53 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.li
import org.apache.wicket.IResourceListener;
import org.apache.wicket.request.cycle.RequestCycle;
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.IResource;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.request.resource.IResource.Attributes;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java Thu Mar 18 05:28:53 2010
@@ -19,8 +19,8 @@ package org.apache.wicket.markup.html.pa
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebResponse;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java Thu Mar 18 05:28:53 2010
@@ -29,9 +29,9 @@ import org.apache.wicket.protocol.http.r
import org.apache.wicket.request.ClientInfo;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.handler.PageProvider;
-import org.apache.wicket.request.handler.basic.RedirectRequestHandler;
import org.apache.wicket.request.handler.impl.BookmarkablePageRequestHandler;
-import org.apache.wicket.request.mapper.parameters.PageParameters;
+import org.apache.wicket.request.http.handler.RedirectRequestHandler;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.settings.IRequestCycleSettings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java Thu Mar 18 05:28:53 2010
@@ -31,7 +31,7 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.markup.html.basic.MultiLineLabel;
import org.apache.wicket.markup.html.debug.PageView;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.util.string.AppendingStringBuffer;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java Thu Mar 18 05:28:53 2010
@@ -19,8 +19,8 @@ package org.apache.wicket.markup.html.pa
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebResponse;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java Thu Mar 18 05:28:53 2010
@@ -19,8 +19,8 @@ package org.apache.wicket.markup.html.pa
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebResponse;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java Thu Mar 18 05:28:53 2010
@@ -21,7 +21,6 @@ import javax.swing.tree.TreeModel;
import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Response;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -31,6 +30,7 @@ import org.apache.wicket.markup.Componen
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.lang.EnumeratedType;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java Thu Mar 18 05:28:53 2010
@@ -33,7 +33,7 @@ import org.apache.wicket.markup.html.lin
import org.apache.wicket.markup.parser.filter.WicketLinkTagHandler;
import org.apache.wicket.protocol.http.RequestUtils;
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.PackageResource;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java Thu Mar 18 05:28:53 2010
@@ -23,7 +23,6 @@ import java.util.Map;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Response;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupElement;
@@ -33,6 +32,7 @@ import org.apache.wicket.markup.WicketTa
import org.apache.wicket.markup.parser.XmlTag;
import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
import org.apache.wicket.model.Model;
+import org.apache.wicket.request.Response;
import org.apache.wicket.response.StringResponse;
import org.apache.wicket.util.lang.PropertyResolver;
import org.apache.wicket.util.string.Strings;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java Thu Mar 18 05:28:53 2010
@@ -18,11 +18,11 @@ package org.apache.wicket.markup.transfo
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Response;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.Response;
import org.apache.wicket.response.StringResponse;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java?rev=924639&r1=924638&r2=924639&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java Thu Mar 18 05:28:53 2010
@@ -21,8 +21,8 @@ import org.apache.wicket.WicketRuntimeEx
import org.apache.wicket.behavior.AbstractBehavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.protocol.http.BufferedWebResponse;
-import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebResponse;
/**
* A IBehavior which can be added to any component. It allows to post-process (transform) the markup