You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2010/01/04 02:03:49 UTC
svn commit: r895520 [7/7] - in /wicket/trunk:
wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/
wicket/src/main/disabled/ wicket/src/main/di...
Added: 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=895520&view=auto
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java (added)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java Mon Jan 4 01:03:29 2010
@@ -0,0 +1,202 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.protocol.http.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.util.lang.Checks;
+
+/**
+ * WebResponse that wraps a {@link ServletWebResponse}.
+ *
+ * @author Matej Knopp
+ */
+public class ServletWebResponse extends WebResponse
+{
+ private final HttpServletResponse httpServletResponse;
+
+ /**
+ * Construct.
+ *
+ * @param httpServletResponse
+ */
+ public ServletWebResponse(HttpServletResponse httpServletResponse)
+ {
+ Checks.argumentNotNull(httpServletResponse, "httpServletResponse");
+
+ this.httpServletResponse = httpServletResponse;
+ }
+
+ /**
+ * Returns the wrapped response
+ *
+ * @return wrapped response
+ */
+ public final HttpServletResponse getHttpServletResponse()
+ {
+ return httpServletResponse;
+ }
+
+ @Override
+ public void addCookie(Cookie cookie)
+ {
+ httpServletResponse.addCookie(cookie);
+ }
+
+ @Override
+ public void clearCookie(Cookie cookie)
+ {
+ cookie.setMaxAge(0);
+ cookie.setValue(null);
+ addCookie(cookie);
+ }
+
+ @Override
+ public void setContentLength(long length)
+ {
+ httpServletResponse.setContentLength((int)length);
+ }
+
+ @Override
+ public void setContentType(String mimeType)
+ {
+ httpServletResponse.setContentType(mimeType);
+ }
+
+ @Override
+ public void setDateHeader(String name, long date)
+ {
+ httpServletResponse.setDateHeader(name, date);
+ }
+
+ @Override
+ public void setHeader(String name, String value)
+ {
+ httpServletResponse.setHeader(name, value);
+ }
+
+ @Override
+ public void write(CharSequence sequence)
+ {
+ try
+ {
+ httpServletResponse.getWriter().append(sequence);
+ }
+ catch (IOException e)
+ {
+ throw new WicketRuntimeException(e);
+ }
+ }
+
+ @Override
+ public void write(byte[] array)
+ {
+ try
+ {
+ httpServletResponse.getOutputStream().write(array);
+ }
+ catch (IOException e)
+ {
+ throw new WicketRuntimeException(e);
+ }
+ }
+
+ @Override
+ public void setStatus(int sc)
+ {
+ httpServletResponse.setStatus(sc);
+ }
+
+ @Override
+ public void sendError(int sc, String msg)
+ {
+ try
+ {
+ if (msg == null)
+ {
+ httpServletResponse.sendError(sc);
+ }
+ else
+ {
+ httpServletResponse.sendError(sc, msg);
+ }
+ }
+ catch (IOException e)
+ {
+ throw new WicketRuntimeException(e);
+ }
+ }
+
+ @Override
+ public String encodeURL(CharSequence url)
+ {
+ if (url != null)
+ {
+ if (url.length() > 0 && url.charAt(0) == '?')
+ {
+ // there is a bug in apache tomcat 5.5 where tomcat doesn't put sessionid to url
+ // when the URL starts with '?'. So we prepend the URL with ./ and remove it
+ // afterwards (unless some container prepends session id before './' or mangles
+ // the URL otherwise
+
+ String encoded = httpServletResponse.encodeURL("./" + url.toString());
+ if (encoded.startsWith("./"))
+ {
+ return encoded.substring(2);
+ }
+ else
+ {
+ return encoded;
+ }
+ }
+ else
+ {
+ return httpServletResponse.encodeURL(url.toString());
+ }
+ }
+ // FIXME NULL? Really?
+ return httpServletResponse.encodeURL(null);
+ }
+
+ private boolean redirect = false;
+
+ @Override
+ public void sendRedirect(String url)
+ {
+ redirect = true;
+ url = httpServletResponse.encodeRedirectURL(url);
+ try
+ {
+ httpServletResponse.sendRedirect(url);
+ }
+ catch (IOException e)
+ {
+ throw new WicketRuntimeException(e);
+ }
+ }
+
+ @Override
+ public boolean isRedirect()
+ {
+ return redirect;
+ }
+}
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java Mon Jan 4 01:03:29 2010
@@ -29,6 +29,7 @@
import org.apache.wicket.Application;
import org.apache.wicket.Session;
+import org.apache.wicket.ng.ThreadContext;
import org.apache.wicket.protocol.http.WebApplication;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -169,7 +170,7 @@
if (session != null)
{
// set the session's threadlocal
- Session.set(session);
+ ThreadContext.setSession(session);
if (log.isDebugEnabled())
{
@@ -201,7 +202,7 @@
}
finally
{
- Session.unset();
+ ThreadContext.detach();
}
}
Added: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/AbortRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/AbortRequestHandler.java?rev=895520&view=auto
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/AbortRequestHandler.java (added)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/AbortRequestHandler.java Mon Jan 4 01:03:29 2010
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.request.target.basic;
+
+import org.apache.wicket.IRequestHandler;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
+
+public class AbortRequestHandler implements IRequestHandler
+{
+
+ public void detach(RequestCycle requestCycle)
+ {
+ }
+
+ public void respond(RequestCycle requestCycle)
+ {
+ // TODO
+ }
+
+}
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/AbortRequestHandler.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyAjaxRequestHandler.java (from r895314, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyAjaxRequestTarget.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyAjaxRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyAjaxRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyAjaxRequestTarget.java&r1=895314&r2=895520&rev=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyAjaxRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyAjaxRequestHandler.java Mon Jan 4 01:03:29 2010
@@ -17,8 +17,8 @@
package org.apache.wicket.request.target.basic;
import org.apache.wicket.Application;
-import org.apache.wicket.IRequestTarget;
-import org.apache.wicket.RequestCycle;
+import org.apache.wicket.IRequestHandler;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebResponse;
/**
@@ -26,18 +26,18 @@
*
* @author Matej Knopp
*/
-public final class EmptyAjaxRequestTarget implements IRequestTarget
+public final class EmptyAjaxRequestHandler implements IRequestHandler
{
/** immutable hashcode. */
private static final int HASH = 17 * 1542323;
/** singleton instance. */
- private static final EmptyAjaxRequestTarget instance = new EmptyAjaxRequestTarget();
+ private static final EmptyAjaxRequestHandler instance = new EmptyAjaxRequestHandler();
/**
* Construct.
*/
- private EmptyAjaxRequestTarget()
+ private EmptyAjaxRequestHandler()
{
}
@@ -46,13 +46,13 @@
*
* @return the singleton instance
*/
- public static final EmptyAjaxRequestTarget getInstance()
+ public static final EmptyAjaxRequestHandler getInstance()
{
return instance;
}
/**
- * @see org.apache.wicket.IRequestTarget#respond(org.apache.wicket.RequestCycle)
+ * @see org.apache.wicket.IRequestHandler#respond(org.apache.wicket.RequestCycle)
*/
public void respond(RequestCycle requestCycle)
{
@@ -62,7 +62,6 @@
.getResponseRequestEncoding();
// Set content type based on markup type for page
- response.setCharacterEncoding(encoding);
response.setContentType("text/xml; charset=" + encoding);
// Make sure it is not cached by a client
@@ -76,7 +75,7 @@
}
/**
- * @see org.apache.wicket.IRequestTarget#detach(org.apache.wicket.RequestCycle)
+ * @see org.apache.wicket.IRequestHandler#detach(org.apache.wicket.RequestCycle)
*/
public void detach(RequestCycle requestCycle)
{
@@ -88,7 +87,7 @@
@Override
public boolean equals(Object obj)
{
- if (obj instanceof EmptyAjaxRequestTarget)
+ if (obj instanceof EmptyAjaxRequestHandler)
{
return true;
}
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestHandler.java (from r895314, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestTarget.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestTarget.java&r1=895314&r2=895520&rev=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestHandler.java Mon Jan 4 01:03:29 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.request.target.basic;
-import org.apache.wicket.IRequestTarget;
-import org.apache.wicket.RequestCycle;
+import org.apache.wicket.IRequestHandler;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
/**
* The empty request target does nothing in itself but instead relies on some other source to
@@ -25,18 +25,18 @@
*
* @author Eelco Hillenius
*/
-public final class EmptyRequestTarget implements IRequestTarget
+public final class EmptyRequestHandler implements IRequestHandler
{
/** immutable hashcode. */
private static final int HASH = 17 * 3214424;
/** singleton instance. */
- private static final EmptyRequestTarget instance = new EmptyRequestTarget();
+ private static final EmptyRequestHandler instance = new EmptyRequestHandler();
/**
* Construct.
*/
- private EmptyRequestTarget()
+ private EmptyRequestHandler()
{
}
@@ -45,7 +45,7 @@
*
* @return the singleton instance
*/
- public static final EmptyRequestTarget getInstance()
+ public static final EmptyRequestHandler getInstance()
{
return instance;
}
@@ -53,14 +53,14 @@
/**
* Does nothing at all.
*
- * @see org.apache.wicket.IRequestTarget#respond(org.apache.wicket.RequestCycle)
+ * @see org.apache.wicket.IRequestHandler#respond(org.apache.wicket.RequestCycle)
*/
public void respond(RequestCycle requestCycle)
{
}
/**
- * @see org.apache.wicket.IRequestTarget#detach(org.apache.wicket.RequestCycle)
+ * @see org.apache.wicket.IRequestHandler#detach(org.apache.wicket.RequestCycle)
*/
public void detach(RequestCycle requestCycle)
{
@@ -72,7 +72,7 @@
@Override
public boolean equals(Object obj)
{
- if (obj instanceof EmptyRequestTarget)
+ if (obj instanceof EmptyRequestHandler)
{
return true;
}
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/RedirectRequestHandler.java (from r895314, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/RedirectRequestTarget.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/RedirectRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/RedirectRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/RedirectRequestTarget.java&r1=895314&r2=895520&rev=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/RedirectRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/RedirectRequestHandler.java Mon Jan 4 01:03:29 2010
@@ -16,13 +16,13 @@
*/
package org.apache.wicket.request.target.basic;
-import org.apache.wicket.IRequestTarget;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.RequestContext;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.Response;
import org.apache.wicket.markup.html.pages.RedirectPage;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
-import org.apache.wicket.request.target.component.listener.RedirectPageRequestTarget;
+import org.apache.wicket.util.string.UrlUtils;
/**
* A RequestTarget that will send a redirect url to the browser. Use this if you want to direct the
@@ -35,7 +35,7 @@
* @see RedirectPageRequestTarget
* @author jcompagner
*/
-public class RedirectRequestTarget implements IRequestTarget
+public class RedirectRequestHandler implements IRequestHandler
{
private final String redirectUrl;
@@ -51,14 +51,14 @@
* @param redirectUrl
* URL to redirect to.
*/
- public RedirectRequestTarget(String redirectUrl)
+ public RedirectRequestHandler(String redirectUrl)
{
this.redirectUrl = redirectUrl;
}
/**
- * @see org.apache.wicket.IRequestTarget#detach(org.apache.wicket.RequestCycle)
+ * @see org.apache.wicket.IRequestHandler#detach(org.apache.wicket.RequestCycle)
*/
public void detach(RequestCycle requestCycle)
{
@@ -67,12 +67,12 @@
/**
* FIXME javadoc - what's special about this implementation?
*
- * @see org.apache.wicket.IRequestTarget#respond(org.apache.wicket.RequestCycle)
+ * @see org.apache.wicket.IRequestHandler#respond(org.apache.wicket.RequestCycle)
*/
public void respond(RequestCycle requestCycle)
{
- Response response = requestCycle.getResponse();
- response.reset();
+ WebResponse response = (WebResponse)requestCycle.getResponse();
+
if (redirectUrl.startsWith("/"))
{
// context-absolute url
@@ -80,34 +80,30 @@
RequestContext rc = RequestContext.get();
if (rc.isPortletRequest() && ((PortletRequestContext)rc).isEmbedded())
{
- response.redirect(redirectUrl);
+ response.sendRedirect(redirectUrl);
}
else
{
- String location = RequestCycle.get()
- .getProcessor()
- .getRequestCodingStrategy()
- .rewriteStaticRelativeUrl(redirectUrl.substring(1));
+ String location = UrlUtils.rewriteToContextRelative(redirectUrl.substring(1),
+ requestCycle.getRequest());
+
// IE does not understand "./" in a path, just "." is okay.
if (location.startsWith("./"))
{
location = location.length() == 2 ? "." : location.substring(2);
}
- response.redirect(location);
+ response.sendRedirect(location);
}
}
else if (redirectUrl.contains("://"))
{
// absolute url
- response.redirect(redirectUrl);
+ response.sendRedirect(redirectUrl);
}
else
{
// relative url
- response.redirect(RequestCycle.get()
- .getRequest()
- .getRelativePathPrefixToWicketHandler() +
- redirectUrl);
+ response.sendRedirect(redirectUrl);
}
}
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestHandler.java (from r895314, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestTarget.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestTarget.java&r1=895314&r2=895520&rev=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestHandler.java Mon Jan 4 01:03:29 2010
@@ -19,10 +19,10 @@
import java.io.IOException;
import org.apache.wicket.Application;
-import org.apache.wicket.IRequestTarget;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.Response;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.util.string.Strings;
@@ -31,7 +31,7 @@
*
* @author Eelco Hillenius
*/
-public class StringRequestTarget implements IRequestTarget
+public class StringRequestHandler implements IRequestHandler
{
/** the string for the response. */
private final String string;
@@ -50,7 +50,7 @@
* @param string
* the string for the response
*/
- public StringRequestTarget(String string)
+ public StringRequestHandler(String string)
{
this("text/plain", getDefaultEncoding(), string);
}
@@ -66,7 +66,7 @@
* @param string
* string for the response
*/
- public StringRequestTarget(String contentType, String encoding, String string)
+ public StringRequestHandler(String contentType, String encoding, String string)
{
if (string == null)
{
@@ -99,18 +99,18 @@
/**
* Responds by sending the string property.
*
- * @see org.apache.wicket.IRequestTarget#respond(org.apache.wicket.RequestCycle)
+ * @see org.apache.wicket.IRequestHandler#respond(org.apache.wicket.RequestCycle)
*/
public void respond(RequestCycle requestCycle)
{
// Get servlet response to use when responding with resource
- final Response response = requestCycle.getResponse();
+ final WebResponse response = (WebResponse)requestCycle.getResponse();
response.setContentType(contentType + ";charset=" + encoding);
// send string to client
try
{
- response.getOutputStream().write(string.getBytes(encoding));
+ response.write(string.getBytes(encoding));
}
catch (IOException e)
{
@@ -119,7 +119,7 @@
}
/**
- * @see org.apache.wicket.IRequestTarget#detach(org.apache.wicket.RequestCycle)
+ * @see org.apache.wicket.IRequestHandler#detach(org.apache.wicket.RequestCycle)
*/
public void detach(RequestCycle requestCycle)
{
@@ -141,9 +141,9 @@
@Override
public boolean equals(Object obj)
{
- if (obj instanceof StringRequestTarget)
+ if (obj instanceof StringRequestHandler)
{
- StringRequestTarget that = (StringRequestTarget)obj;
+ StringRequestHandler that = (StringRequestHandler)obj;
return string.equals(that.string);
}
return false;
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestHandler.java (from r895314, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestTarget.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestTarget.java&r1=895314&r2=895520&rev=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestHandler.java Mon Jan 4 01:03:29 2010
@@ -17,15 +17,16 @@
package org.apache.wicket.request.target.resource;
import java.io.IOException;
+import java.io.OutputStream;
import javax.servlet.http.HttpServletResponse;
-import org.apache.wicket.IRequestTarget;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.Response;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebResponse;
-import org.apache.wicket.protocol.http.request.WebErrorCodeResponseTarget;
+import org.apache.wicket.protocol.http.request.WebErrorCodeResponseHandler;
+import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.IResourceStreamWriter;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
@@ -38,10 +39,10 @@
*
* @author Eelco Hillenius
*/
-public class ResourceStreamRequestTarget implements IRequestTarget
+public class ResourceStreamRequestHandler implements IRequestHandler
{
/** Logger */
- private static final Logger log = LoggerFactory.getLogger(ResourceStreamRequestTarget.class);
+ private static final Logger log = LoggerFactory.getLogger(ResourceStreamRequestHandler.class);
/**
* Optional filename, used to set the content disposition header. Only meaningful when using
@@ -58,7 +59,7 @@
* @param resourceStream
* the resource stream for the response
*/
- public ResourceStreamRequestTarget(IResourceStream resourceStream)
+ public ResourceStreamRequestHandler(IResourceStream resourceStream)
{
this.resourceStream = resourceStream;
}
@@ -70,14 +71,14 @@
* the resource stream for the response
* @param fileName
*/
- public ResourceStreamRequestTarget(IResourceStream resourceStream, String fileName)
+ public ResourceStreamRequestHandler(IResourceStream resourceStream, String fileName)
{
this.resourceStream = resourceStream;
this.fileName = fileName;
}
/**
- * @see org.apache.wicket.IRequestTarget#detach(org.apache.wicket.RequestCycle)
+ * @see org.apache.wicket.IRequestHandler#detach(org.apache.wicket.RequestCycle)
*/
public void detach(RequestCycle requestCycle)
{
@@ -97,9 +98,9 @@
@Override
public boolean equals(Object obj)
{
- if (obj instanceof ResourceStreamRequestTarget)
+ if (obj instanceof ResourceStreamRequestHandler)
{
- ResourceStreamRequestTarget that = (ResourceStreamRequestTarget)obj;
+ ResourceStreamRequestHandler that = (ResourceStreamRequestHandler)obj;
return resourceStream.equals(that.resourceStream) &&
((fileName != null) ? fileName.equals(that.fileName) : true);
}
@@ -140,12 +141,12 @@
/**
* Responds by sending the contents of the resource stream.
*
- * @see org.apache.wicket.IRequestTarget#respond(org.apache.wicket.RequestCycle)
+ * @see org.apache.wicket.IRequestHandler#respond(org.apache.wicket.RequestCycle)
*/
public void respond(RequestCycle requestCycle)
{
// Get servlet response to use when responding with resource
- final Response response = requestCycle.getResponse();
+ final WebResponse response = (WebResponse)requestCycle.getResponse();
configure(requestCycle, response, resourceStream);
@@ -153,16 +154,38 @@
{
if (resourceStream instanceof IResourceStreamWriter)
{
- ((IResourceStreamWriter)resourceStream).write(response.getOutputStream());
+ ((IResourceStreamWriter)resourceStream).write(response);
}
else
{
- response.write(resourceStream.getInputStream());
+ OutputStream s = new OutputStream()
+ {
+ @Override
+ public void write(int b) throws IOException
+ {
+ response.write(new byte[] { (byte)b });
+ }
+
+ @Override
+ public void write(byte[] b) throws IOException
+ {
+ response.write(b);
+ }
+
+ };
+ try
+ {
+ Streams.copy(resourceStream.getInputStream(), s);
+ }
+ catch (IOException e)
+ {
+ throw new WicketRuntimeException(e);
+ }
}
}
catch (ResourceStreamNotFoundException e)
{
- requestCycle.setRequestTarget(new WebErrorCodeResponseTarget(
+ requestCycle.scheduleRequestHandlerAfterCurrent(new WebErrorCodeResponseHandler(
HttpServletResponse.SC_NOT_FOUND));
}
}
@@ -174,7 +197,7 @@
*
* @return The this.
*/
- public ResourceStreamRequestTarget setFileName(String fileName)
+ public ResourceStreamRequestHandler setFileName(String fileName)
{
this.fileName = fileName;
return this;
@@ -200,38 +223,40 @@
* @param resourceStream
* the resource stream that will be rendered
*/
- protected void configure(final RequestCycle requestCycle, final Response response,
+ protected void configure(final RequestCycle requestCycle, final WebResponse response,
final IResourceStream resourceStream)
{
- // Configure response with content type of resource, if available
- String responseType = resourceStream.getContentType();
- if (responseType != null)
- {
- if (responseType.toLowerCase().indexOf("text") != -1)
- {
- response.setContentType(responseType + "; charset=" +
- response.getCharacterEncoding());
- }
- else
- {
- response.setContentType(responseType);
- }
+ // TODO (NG) mime type
- }
- else
- {
- // otherwise detect content-type automatically
- if (getFileName() != null)
- {
- response.detectContentType(requestCycle, getFileName());
- }
- else
- {
- response.detectContentType(requestCycle, requestCycle.getRequest()
- .getUrl()
- .toString());
- }
- }
+// // Configure response with content type of resource, if available
+// String responseType = resourceStream.getContentType();
+// if (responseType != null)
+// {
+// if (responseType.toLowerCase().indexOf("text") != -1)
+// {
+// response.setContentType(responseType + "; charset=" +
+// response.getCharacterEncoding());
+// }
+// else
+// {
+// response.setContentType(responseType);
+// }
+//
+// }
+// else
+// {
+// // otherwise detect content-type automatically
+// if (getFileName() != null)
+// {
+// response.detectContentType(requestCycle, getFileName());
+// }
+// else
+// {
+// response.detectContentType(requestCycle, requestCycle.getRequest()
+// .getUrl()
+// .toString());
+// }
+// }
// WICKET-473 Allow IResourceStream.length() to return -1
long len = resourceStream.length();
@@ -245,7 +270,7 @@
String file = getFileName();
if (file != null && (response instanceof WebResponse))
{
- ((WebResponse)response).setAttachmentHeader(file);
+ (response).setAttachmentHeader(file);
}
}
}
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
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=895520&r1=895519&r2=895520&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 Mon Jan 4 01:03:29 2010
@@ -16,9 +16,6 @@
*/
package org.apache.wicket.response;
-import java.io.IOException;
-import java.io.OutputStream;
-
import org.apache.wicket.Response;
@@ -56,23 +53,14 @@
// Does nothing
}
- /**
- * @see org.apache.wicket.Response#getOutputStream()
- */
@Override
- public OutputStream getOutputStream()
+ public void write(byte[] array)
{
- return new OutputStream()
- {
- @Override
- public void write(int b) throws IOException
- {
- }
- };
}
@Override
- public void write(byte[] array)
+ public String encodeURL(CharSequence url)
{
+ return url != null ? url.toString() : null;
}
}
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=895520&r1=895519&r2=895520&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 Mon Jan 4 01:03:29 2010
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.response;
-import java.io.OutputStream;
-
import org.apache.wicket.Response;
import org.apache.wicket.util.string.AppendingStringBuffer;
@@ -55,7 +53,6 @@
/**
* @see org.apache.wicket.Response#reset()
*/
- @Override
public void reset()
{
out.clear();
@@ -82,14 +79,14 @@
* @see org.apache.wicket.Response#getOutputStream()
*/
@Override
- public OutputStream getOutputStream()
+ public void write(byte[] array)
{
- throw new UnsupportedOperationException("Cannot get output stream on StringResponse");
+ throw new UnsupportedOperationException();
}
@Override
- public void write(byte[] array)
+ public String encodeURL(CharSequence url)
{
- throw new UnsupportedOperationException();
+ return url != null ? url.toString() : null;
}
}
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=895520&r1=895519&r2=895520&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 Mon Jan 4 01:03:29 2010
@@ -23,20 +23,19 @@
import org.apache.wicket.AbortException;
import org.apache.wicket.IPageFactory;
import org.apache.wicket.Page;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.authorization.AuthorizationException;
import org.apache.wicket.markup.MarkupException;
-import org.apache.wicket.ng.request.component.PageParametersNg;
import org.apache.wicket.ng.request.component.IRequestablePage;
+import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.util.lang.Generics;
/**
* A factory that constructs Pages.
*
- * @see org.apache.wicket.settings.ISessionSettings#setPageFactory(IPageFactory)
- * @see IPageFactory
+ * @see org.apache.wicket.settings.ISessionSettings#setPageFactory(PageFactory)
+ * @see PageFactory
*
* @author Juergen Donnerstag
* @author Jonathan Locke
@@ -44,90 +43,55 @@
public final class DefaultPageFactory implements IPageFactory
{
/** Map of Constructors for Page subclasses */
- private final Map<Class<? extends Page>, Constructor<? extends Page>> constructorForClass = Generics.newConcurrentHashMap();
+ private final Map<Class<?>, Constructor<?>> constructorForClass = Generics.newConcurrentHashMap();
/**
- * @see IPageFactory#newPage(Class)
+ * @see PageFactory#newPage(Class)
*/
- public final <C extends Page> Page newPage(final Class<C> pageClass)
+ public final <C extends IRequestablePage> Page newPage(final Class<C> pageClass)
{
- // Try default constructor if one exists
- Constructor<? extends Page> constructor = constructor(pageClass);
- if (constructor != null)
+ try
{
- // return new Page()
- return createPage(constructor, null);
- }
+ // throw an exception in case default constructor is missing
+ // => improved error message
+ final Constructor<? extends IRequestablePage> constructor = pageClass.getConstructor((Class[])null);
- // Try to get constructor that takes PageParameters
- constructor = constructor(pageClass, PageParameters.class);
- if (constructor != null)
+ return processPage(newPage(constructor, null), null);
+ }
+ catch (NoSuchMethodException e)
{
- // return new Page(parameters)
- return createPage(constructor, new PageParameters());
+ // a bit of a hack here..
+ Constructor<?> constructor = constructor(pageClass, PageParameters.class);
+ if (constructor != null)
+ {
+ return newPage(constructor, new PageParameters());
+ }
+ else
+ {
+ throw new WicketRuntimeException("Unable to create page from " + pageClass +
+ ". Class does not have a default contructor", e);
+ }
}
-
- throw new WicketRuntimeException("Unable to create page from " + pageClass +
- ". Class does neither have a constructor with PageParameter nor a default constructor");
}
/**
- * @see IPageFactory#newPage(Class, PageParameters)
- * @deprecated
+ * @see PageFactory#newPage(Class, PageParameters)
*/
- @Deprecated
- public final <C extends Page> Page newPage(final Class<C> pageClass, PageParameters parameters)
+ public final <C extends IRequestablePage> Page newPage(final Class<C> pageClass,
+ final PageParameters parameters)
{
- // If no parameters are provided, try the default constructor first, than the PageParameter
- // constructor with empty parameter list.
- if (parameters == null)
- {
- return newPage(pageClass);
- }
+ // Try to get constructor that takes PageParameters
+ Constructor<?> constructor = constructor(pageClass, PageParameters.class);
- // If parameters not null, than try to get constructor that takes PageParameters
- Constructor<? extends Page> constructor = constructor(pageClass, PageParameters.class);
+ // If we got a PageParameters constructor
if (constructor != null)
{
// return new Page(parameters)
- return createPage(constructor, parameters);
- }
-
- // No constructor with PageParameters found. Try default constructor.
- constructor = constructor(pageClass);
- if (constructor != null)
- {
- // return new Page()
- return createPage(constructor, null);
- }
-
- throw new WicketRuntimeException("Unable to create page from " + pageClass +
- ". Class does neither have a constructor with PageParameter nor a default constructor");
- }
-
- /**
- * Looks up a one-arg Page constructor by class and argument type.
- *
- * @param <C>
- *
- * @param pageClass
- * The class of page
- * @return The page constructor, or null if no one-arg constructor can be found taking the given
- * argument type.
- */
- private final <C extends Page> Constructor<? extends Page> constructor(final Class<C> pageClass)
- {
- try
- {
- // Try to find the constructor
- return pageClass.getConstructor();
- }
- catch (NoSuchMethodException e)
- {
- // Ignore
+ return processPage(newPage(constructor, parameters), parameters);
}
- return null;
+ // Always try default constructor if one exists
+ return processPage(newPage(pageClass), parameters);
}
/**
@@ -142,11 +106,11 @@
* @return The page constructor, or null if no one-arg constructor can be found taking the given
* argument type.
*/
- private final <C extends Page> Constructor<? extends Page> constructor(
- final Class<C> pageClass, final Class<PageParameters> argumentType)
+ private final <C extends IRequestablePage> Constructor<?> constructor(final Class<C> pageClass,
+ final Class<PageParameters> argumentType)
{
// Get constructor for page class from cache
- Constructor<? extends Page> constructor = constructorForClass.get(pageClass);
+ Constructor<?> constructor = constructorForClass.get(pageClass);
// Need to look up?
if (constructor == null)
@@ -170,8 +134,6 @@
/**
* Creates a new Page using the given constructor and argument.
- * <p>
- * Note that you can not create a Page with PageParameters and pass null.
*
* @param constructor
* The constructor to invoke
@@ -182,19 +144,14 @@
* Thrown if the Page cannot be instantiated using the given constructor and
* argument.
*/
- private final Page createPage(final Constructor<? extends Page> constructor,
- final Object argument)
+ private final Page newPage(final Constructor<?> constructor, final Object argument)
{
try
{
if (argument != null)
- {
- return constructor.newInstance(new Object[] { argument });
- }
+ return (Page)constructor.newInstance(new Object[] { argument });
else
- {
- return constructor.newInstance();
- }
+ return (Page)constructor.newInstance(new Object[] {});
}
catch (InstantiationException e)
{
@@ -206,7 +163,6 @@
}
catch (InvocationTargetException e)
{
- // honor redirect exception contract defined in IPageFactory
if (e.getTargetException() instanceof AbortException ||
e.getTargetException() instanceof AuthorizationException ||
e.getTargetException() instanceof MarkupException)
@@ -217,51 +173,26 @@
}
}
- /**
- *
- * @param constructor
- * @param argument
- * @return description
- */
- private String createDescription(Constructor<? extends Page> constructor, Object argument)
- {
- if (argument != null)
- {
- return "Can't instantiate page using constructor " + constructor + " and argument " +
- argument;
- }
- else
- {
- return "Can't instantiate page using constructor " + constructor;
- }
- }
-
- public <C extends Page> IRequestablePage newPage(Class<C> pageClass, PageParametersNg parameters)
+ private Page processPage(Page page, PageParameters pageParameters)
{
- // If no parameters are provided, try the default constructor first, than the PageParameter
- // constructor with empty parameter list.
- if (parameters == null)
+ // the page might have not propagate page parameters from constructor. if that's the case
+ // we force the parameters
+ if (pageParameters != null && page.getPageParameters() != pageParameters)
{
- return newPage(pageClass);
+ page.getPageParameters().assign(pageParameters);
}
- // If parameters not null, than try to get constructor that takes PageParameters
- Constructor<? extends Page> constructor = constructor(pageClass, PageParameters.class);
- if (constructor != null)
- {
- // return new Page(parameters)
- return createPage(constructor, parameters);
- }
+ page.setWasCreatedBookmarkable(true);
- // No constructor with PageParameters found. Try default constructor.
- constructor = constructor(pageClass);
- if (constructor != null)
- {
- // return new Page()
- return createPage(constructor, null);
- }
+ return page;
+ }
- throw new WicketRuntimeException("Unable to create page from " + pageClass +
- ". Class does neither have a constructor with PageParameter nor a default constructor");
+ private String createDescription(Constructor<?> constructor, Object argument)
+ {
+ if (argument != null)
+ return "Can't instantiate page using constructor " + constructor + " and argument " +
+ argument;
+ else
+ return "Can't instantiate page using constructor " + constructor;
}
}
\ No newline at end of file
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java Mon Jan 4 01:03:29 2010
@@ -19,9 +19,9 @@
import java.util.List;
import org.apache.wicket.IResponseFilter;
-import org.apache.wicket.RequestCycle;
import org.apache.wicket.Session;
import org.apache.wicket.markup.html.pages.BrowserInfoPage;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebRequestCycle;
import org.apache.wicket.request.target.component.BookmarkableListenerInterfaceRequestTarget;
import org.apache.wicket.settings.IExceptionSettings.UnexpectedExceptionDisplay;
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=895520&r1=895519&r2=895520&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 Mon Jan 4 01:03:29 2010
@@ -19,10 +19,10 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
-import org.apache.wicket.RequestCycle;
import org.apache.wicket.markup.html.form.FormComponent;
-import org.apache.wicket.protocol.http.WebRequest;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Time;
import org.slf4j.Logger;
@@ -343,9 +343,9 @@
*
* @return WebRequest related to the RequestCycle
*/
- private WebRequest getWebRequest()
+ private ServletWebRequest getWebRequest()
{
- return (WebRequest)RequestCycle.get().getRequest();
+ return (ServletWebRequest)RequestCycle.get().getRequest();
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/KeyInSessionSunJceCryptFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/KeyInSessionSunJceCryptFactory.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/KeyInSessionSunJceCryptFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/KeyInSessionSunJceCryptFactory.java Mon Jan 4 01:03:29 2010
@@ -18,10 +18,12 @@
import java.util.UUID;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.protocol.http.WebRequestCycle;
+import org.apache.wicket.Application;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
/**
* Crypt factory that produces {@link SunJceCrypt} instances based on http session-specific
@@ -36,13 +38,14 @@
{
public ICrypt newCrypt()
{
- WebRequestCycle rc = (WebRequestCycle)RequestCycle.get();
+ RequestCycle rc = RequestCycle.get();
+ HttpServletRequest request = ((ServletWebRequest)rc.getRequest()).getHttpServletRequest();
// get http session, create if necessary
- HttpSession session = rc.getWebRequest().getHttpServletRequest().getSession(true);
+ HttpSession session = request.getSession(true);
// retrieve or generate encryption key from session
- final String keyAttr = rc.getApplication().getApplicationKey() + "." + getClass().getName();
+ final String keyAttr = Application.get().getApplicationKey() + "." + getClass().getName();
String key = (String)session.getAttribute(keyAttr);
if (key == null)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java Mon Jan 4 01:03:29 2010
@@ -33,6 +33,7 @@
import org.apache.wicket.Component;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.application.IClassResolver;
+import org.apache.wicket.ng.ThreadContext;
import org.apache.wicket.settings.IApplicationSettings;
import org.apache.wicket.util.io.ByteCountingOutputStream;
import org.apache.wicket.util.io.IObjectStreamFactory;
@@ -392,11 +393,11 @@
*/
public static Object byteArrayToObject(final byte[] data)
{
+ ThreadContext old = ThreadContext.get(false);
try
{
final ByteArrayInputStream in = new ByteArrayInputStream(data);
ObjectInputStream ois = null;
- boolean unsetApplication = false;
try
{
ois = objectStreamFactory.newObjectInputStream(in);
@@ -406,18 +407,13 @@
Application app = Application.get(applicationName);
if (app != null)
{
- Application.set(app);
- unsetApplication = true;
+ ThreadContext.setApplication(app);
}
}
return ois.readObject();
}
finally
{
- if (unsetApplication)
- {
- Application.unset();
- }
if (ois != null)
{
ois.close();
@@ -435,6 +431,10 @@
throw new RuntimeException("Could not deserialize object using `" +
objectStreamFactory.getClass().getName() + "` object factory", e);
}
+ finally
+ {
+ ThreadContext.restore(old);
+ }
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java Mon Jan 4 01:03:29 2010
@@ -23,7 +23,7 @@
import org.apache.wicket.IClusterable;
import org.apache.wicket.protocol.http.WebResponse;
-import org.apache.wicket.request.target.resource.ResourceStreamRequestTarget;
+import org.apache.wicket.request.target.resource.ResourceStreamRequestHandler;
import org.apache.wicket.util.watch.IModifiable;
@@ -45,7 +45,7 @@
* Gets the mime type of this resource
*
* @return The mime type of this resource, such as "image/jpeg" or "text/html". Return null to
- * let {@link ResourceStreamRequestTarget} handle the Content-Type automatically
+ * let {@link ResourceStreamRequestHandler} handle the Content-Type automatically
* @see WebResponse#detectContentType(org.apache.wicket.RequestCycle, String)
*/
String getContentType();
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=895520&r1=895519&r2=895520&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 Mon Jan 4 01:03:29 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.util.resource;
-import java.io.OutputStream;
+import org.apache.wicket.Response;
/**
* Special IResourceStream implementation that a Resource can return when it directly wants to write
@@ -35,7 +35,7 @@
* Implement this method to write the resource data directly the the given OutputStream.
*
* @param output
- * The output stream where the resource can write its content into.
+ * The response where the resource can write its content into.
*/
- void write(OutputStream output);
+ void write(Response output);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java Mon Jan 4 01:03:29 2010
@@ -21,7 +21,7 @@
import javax.servlet.ServletContext;
-import org.apache.wicket.RequestCycle;
+import org.apache.wicket.Application;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.time.Time;
@@ -98,7 +98,7 @@
public InputStream getInputStream() throws ResourceStreamNotFoundException
{
- final ServletContext context = ((WebApplication)RequestCycle.get().getApplication()).getServletContext();
+ final ServletContext context = ((WebApplication)Application.get()).getServletContext();
in = context.getResourceAsStream(url);
if (in == null)
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=895520&r1=895519&r2=895520&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 Mon Jan 4 01:03:29 2010
@@ -113,7 +113,8 @@
}
response.write("src=\"");
response.write(url);
- response.println("\"></script>");
+ response.write("\"></script>");
+ response.write("\n");
}
/**
@@ -191,7 +192,7 @@
public static void writeCloseTag(final Response response)
{
response.write(SCRIPT_CONTENT_SUFFIX);
- response.println("</script>\n");
+ response.write("</script>\n");
}
@@ -210,7 +211,7 @@
*/
public void println(final CharSequence script)
{
- response.println(script);
+ response.write(script);
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/UrlUtils.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/UrlUtils.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/UrlUtils.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/UrlUtils.java Mon Jan 4 01:03:29 2010
@@ -63,12 +63,15 @@
{
if (isRelative(url))
{
- final String prefix = request.getRelativePathPrefixToContextRoot();
- return prefix + url;
+ // TODO: NG: This is pretty much a marker method; We dont have any means to do this now
+ System.out.println("TODO: Implement UrlUtils # rewriteToContextRelative");
+ // final String prefix = request.getRelativePathPrefixToContextRoot();
+ // return prefix + url;
+ return url;
}
else
{
return url;
}
}
-}
+}
\ No newline at end of file
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java Mon Jan 4 01:03:29 2010
@@ -21,11 +21,7 @@
import java.util.Map;
import org.apache.wicket.Application;
-import org.apache.wicket.Resource;
-import org.apache.wicket.ResourceReference;
-import org.apache.wicket.SharedResources;
-import org.apache.wicket.util.resource.AbstractStringResourceStream;
-import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.ng.resource.ResourceReference;
/**
@@ -101,38 +97,44 @@
*/
public ResourceReference resourceReference(final Map<String, ?> variables)
{
- final String uniqueName = sharedResourceName(variables);
- final String templateValue = template.asString(variables);
- final SharedResources sharedResources = Application.get().getSharedResources();
- final Resource resource = sharedResources.get(uniqueName);
- if (resource == null)
- {
- final Resource newResource = new Resource()
- {
- private static final long serialVersionUID = 1L;
+ // This really doesn't seem like a good idea - to provide this as shared (global) resource
- /**
- * @see org.apache.wicket.Resource#getResourceStream()
- */
- @Override
- public IResourceStream getResourceStream()
- {
- return new AbstractStringResourceStream()
- {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected String getString()
- {
- return templateValue;
- }
-
- };
- }
- };
- sharedResources.add(uniqueName, newResource);
- }
- return new ResourceReference(scopeRef.get(), uniqueName);
+ // TODO (NG) - REALY?!
+
+ return null;
+//
+// final String uniqueName = sharedResourceName(variables);
+// final String templateValue = template.asString(variables);
+// final SharedResources sharedResources = Application.get().getSharedResources();
+// final Resource resource = sharedResources.get(uniqueName);
+// if (resource == null)
+// {
+// final Resource newResource = new Resource()
+// {
+// private static final long serialVersionUID = 1L;
+//
+// /**
+// * @see org.apache.wicket.Resource#getResourceStream()
+// */
+// @Override
+// public IResourceStream getResourceStream()
+// {
+// return new AbstractStringResourceStream()
+// {
+// private static final long serialVersionUID = 1L;
+//
+// @Override
+// protected String getString()
+// {
+// return templateValue;
+// }
+//
+// };
+// }
+// };
+// sharedResources.add(uniqueName, newResource);
+// }
+// return new ResourceReference(scopeRef.get(), uniqueName);
}
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java Mon Jan 4 01:03:29 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.link;
-import org.apache.wicket.IRequestTarget;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.PageParameters;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.protocol.http.WebRequestCycle;
@@ -76,7 +76,7 @@
ObsoleteRequestParameters requestParameters = encoder.decode(tester.getWicketRequest());
- IRequestTarget target1 = cycle.getProcessor().resolve(cycle, requestParameters);
+ IRequestHandler target1 = cycle.getProcessor().resolve(cycle, requestParameters);
PageParameters params = ((BookmarkablePageRequestTarget)target1).getPageParameters();
assertEquals("Integer0", params.getString("0"));
assertEquals("Integer1", params.getString("1"));
@@ -90,6 +90,6 @@
requestParameters = encoder.decode(tester.getWicketRequest());
- IRequestTarget target2 = cycle.getProcessor().resolve(cycle, requestParameters);
+ IRequestHandler target2 = cycle.getProcessor().resolve(cycle, requestParameters);
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockPage.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockPage.java Mon Jan 4 01:03:29 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.ng;
-import org.apache.wicket.ng.request.component.PageParametersNg;
import org.apache.wicket.ng.request.component.IRequestablePage;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
* Simple {@link IRequestablePage} implementation for testing purposes
@@ -26,11 +26,11 @@
*/
public class MockPage extends MockComponent implements IRequestablePage
{
-
+
private static final long serialVersionUID = 1L;
-
+
private int pageId;
-
+
/**
* Construct.
*
@@ -41,9 +41,10 @@
setPath("");
}
-
+
/**
* Construct.
+ *
* @param pageId
* @param pageVersion
* @param pageMapName
@@ -52,9 +53,10 @@
{
setPageId(pageId);
}
-
+
/**
* Sets the page id
+ *
* @param pageId
* @return <code>this</code>
*/
@@ -63,7 +65,7 @@
this.pageId = pageId;
return this;
}
-
+
@Override
public IRequestablePage getPage()
{
@@ -73,22 +75,22 @@
public int getPageId()
{
return pageId;
- }
-
- private PageParametersNg pageParameters = new PageParametersNg();
+ }
+
+ private final PageParameters pageParameters = new PageParameters();
- public PageParametersNg getPageParametersNg()
+ public PageParameters getPageParameters()
{
return pageParameters;
- }
+ }
private boolean bookmarkable;
-
+
public boolean isBookmarkable()
{
return bookmarkable;
}
-
+
/**
* Sets the bookmarkable flags
*
@@ -102,7 +104,7 @@
}
private boolean stateless = false;
-
+
/**
* Sets the stateless flag
*
@@ -114,7 +116,7 @@
this.stateless = stateless;
return this;
}
-
+
public boolean isPageStateless()
{
return stateless;
@@ -123,14 +125,14 @@
public void renderPage()
{
}
-
+
private boolean createBookmarkable;
public boolean wasCreatedBookmarkable()
{
return createBookmarkable;
}
-
+
/**
* Sets the createdBookmarkable flag.
*
@@ -141,19 +143,20 @@
*/
public MockPage setCreatedBookmarkable(boolean createdBookmarkable)
{
- this.createBookmarkable = createdBookmarkable;
+ createBookmarkable = createdBookmarkable;
return this;
}
private int renderCount;
-
+
public int getRenderCount()
{
return renderCount;
}
-
+
/**
* Sets the render count
+ *
* @param renderCount
*/
public void setRenderCount(int renderCount)
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/RequestHandlerStackTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/RequestHandlerStackTest.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/RequestHandlerStackTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/RequestHandlerStackTest.java Mon Jan 4 01:03:29 2010
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.ng.request.cycle;
-import java.io.OutputStream;
-
import junit.framework.TestCase;
import org.apache.wicket.Response;
@@ -52,13 +50,7 @@
}
@Override
- public CharSequence encodeURL(final CharSequence url)
- {
- return null;
- }
-
- @Override
- public OutputStream getOutputStream()
+ public String encodeURL(CharSequence url)
{
return null;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java Mon Jan 4 01:03:29 2010
@@ -20,7 +20,7 @@
import org.apache.wicket.ng.markup.html.link.ILinkListener;
import org.apache.wicket.ng.request.IRequestHandler;
import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.component.PageParametersNg;
+import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.component.IRequestableComponent;
import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
@@ -83,7 +83,7 @@
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getName());
- PageParametersNg p = page.getPageParametersNg();
+ PageParameters p = page.getPageParametersNg();
assertEquals(1, p.getIndexedParamsCount());
assertEquals("indexed1", p.getIndexedParameter(0).toString());
@@ -117,7 +117,7 @@
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
- PageParametersNg p = page.getPageParametersNg();
+ PageParameters p = page.getPageParametersNg();
assertEquals(2, p.getIndexedParamsCount());
assertEquals("i1", p.getIndexedParameter(0).toString());
assertEquals("i2", p.getIndexedParameter(1).toString());
@@ -165,7 +165,7 @@
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPath());
- PageParametersNg p = page.getPageParametersNg();
+ PageParameters p = page.getPageParametersNg();
assertEquals(2, p.getIndexedParamsCount());
assertEquals("i1", p.getIndexedParameter(0).toString());
assertEquals("i2", p.getIndexedParameter(1).toString());
@@ -245,7 +245,7 @@
*/
public void testEncode1()
{
- DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, new PageParametersNg());
+ DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, new PageParameters());
provider.setPageSource(context);
IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -257,7 +257,7 @@
*/
public void testEncode2()
{
- PageParametersNg parameters = new PageParametersNg();
+ PageParameters parameters = new PageParameters();
parameters.setIndexedParameter(0, "i1");
parameters.setIndexedParameter(1, "i2");
parameters.setNamedParameter("a", "b");
@@ -274,7 +274,7 @@
*/
public void testEncode3()
{
- PageParametersNg parameters = new PageParametersNg();
+ PageParameters parameters = new PageParameters();
parameters.setIndexedParameter(0, "i1");
parameters.setIndexedParameter(1, "i2");
parameters.setNamedParameter("a", "b");
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java Mon Jan 4 01:03:29 2010
@@ -23,7 +23,7 @@
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.component.IRequestableComponent;
import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.component.PageParametersNg;
+import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.handler.DefaultPageProvider;
import org.apache.wicket.ng.request.handler.IPageProvider;
import org.apache.wicket.ng.request.handler.IPageRequestHandler;
@@ -91,7 +91,7 @@
assertTrue(handler instanceof RenderPageRequestHandler);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
- PageParametersNg p = page.getPageParametersNg();
+ PageParameters p = page.getPageParametersNg();
assertEquals(1, p.getIndexedParamsCount());
assertEquals("indexed1", p.getIndexedParameter(0).toString());
@@ -125,7 +125,7 @@
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
- PageParametersNg p = page.getPageParametersNg();
+ PageParameters p = page.getPageParametersNg();
assertEquals(2, p.getIndexedParamsCount());
assertEquals("i1", p.getIndexedParameter(0).toString());
assertEquals("i2", p.getIndexedParameter(1).toString());
@@ -172,7 +172,7 @@
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPath());
- PageParametersNg p = page.getPageParametersNg();
+ PageParameters p = page.getPageParametersNg();
assertEquals(2, p.getIndexedParamsCount());
assertEquals("i1", p.getIndexedParameter(0).toString());
assertEquals("i2", p.getIndexedParameter(1).toString());
@@ -270,7 +270,7 @@
public void testEncode1()
{
DefaultPageProvider provider = new DefaultPageProvider(MockPage.class,
- new PageParametersNg());
+ new PageParameters());
provider.setPageSource(context);
IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -282,7 +282,7 @@
*/
public void testEncode2()
{
- PageParametersNg parameters = new PageParametersNg();
+ PageParameters parameters = new PageParameters();
parameters.setIndexedParameter(0, "i1");
parameters.setIndexedParameter(1, "i2");
parameters.setNamedParameter("a", "b");
@@ -299,7 +299,7 @@
*/
public void testEncode3()
{
- PageParametersNg parameters = new PageParametersNg();
+ PageParameters parameters = new PageParameters();
parameters.setIndexedParameter(0, "i1");
parameters.setIndexedParameter(1, "i2");
parameters.setNamedParameter("a", "b");
@@ -492,7 +492,7 @@
assertTrue(handler instanceof RenderPageRequestHandler);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
- PageParametersNg p = page.getPageParametersNg();
+ PageParameters p = page.getPageParametersNg();
assertEquals(1, p.getIndexedParamsCount());
assertEquals("indexed1", p.getIndexedParameter(0).toString());
@@ -508,7 +508,7 @@
*/
public void testPlaceholderEncode2()
{
- PageParametersNg parameters = new PageParametersNg();
+ PageParameters parameters = new PageParameters();
parameters.setIndexedParameter(0, "i1");
parameters.setIndexedParameter(1, "i2");
parameters.setNamedParameter("a", "b");
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java Mon Jan 4 01:03:29 2010
@@ -20,7 +20,7 @@
import org.apache.wicket.ng.request.IRequestHandler;
import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.component.PageParametersNg;
+import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.ng.request.handler.resource.ResourceRequestHandler;
@@ -311,7 +311,7 @@
*/
public void testEncode2()
{
- PageParametersNg parameters = new PageParametersNg();
+ PageParameters parameters = new PageParameters();
parameters.setIndexedParameter(0, "X");
parameters.addNamedParameter("p1", "v1");
parameters.addNamedParameter("p2", "v2");
@@ -338,7 +338,7 @@
*/
public void testEncode4()
{
- PageParametersNg parameters = new PageParametersNg();
+ PageParameters parameters = new PageParameters();
parameters.setIndexedParameter(0, "X");
parameters.addNamedParameter("p1", "v1");
parameters.addNamedParameter("p2", "v2");
@@ -366,7 +366,7 @@
*/
public void testEncode6()
{
- PageParametersNg parameters = new PageParametersNg();
+ PageParameters parameters = new PageParameters();
parameters.setIndexedParameter(0, "X");
parameters.addNamedParameter("p1", "v1");
parameters.addNamedParameter("p2", "v2");
@@ -394,7 +394,7 @@
*/
public void testEncode8()
{
- PageParametersNg parameters = new PageParametersNg();
+ PageParameters parameters = new PageParameters();
parameters.setIndexedParameter(0, "X");
parameters.addNamedParameter("p1", "v1");
parameters.addNamedParameter("p2", "v2");
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java Mon Jan 4 01:03:29 2010
@@ -19,7 +19,7 @@
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ng.MockPage;
import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.component.PageParametersNg;
+import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.listener.RequestListenerInterface;
import org.apache.wicket.ng.resource.ResourceReferenceRegistry;
@@ -113,7 +113,7 @@
int idCounter = 0;
public IRequestablePage newPageInstance(Class<? extends IRequestablePage> pageClass,
- PageParametersNg pageParameters)
+ PageParameters pageParameters)
{
try
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java Mon Jan 4 01:03:29 2010
@@ -22,7 +22,7 @@
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.protocol.http.request.WebExternalResourceRequestTarget;
-import org.apache.wicket.request.target.resource.ResourceStreamRequestTarget;
+import org.apache.wicket.request.target.resource.ResourceStreamRequestHandler;
import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.resource.WebExternalResourceStream;
import org.apache.wicket.util.tester.WicketTester;
@@ -77,7 +77,7 @@
public void testWebExternalResource() throws Exception
{
WebExternalResourceStream resource = new WebExternalResourceStream("/index.html");
- ResourceStreamRequestTarget rt = new ResourceStreamRequestTarget(resource);
+ ResourceStreamRequestHandler rt = new ResourceStreamRequestHandler(resource);
WebRequestCycle cycle = tester.createRequestCycle();
cycle.setRequestTarget(rt);
tester.processRequestCycle(cycle);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java Mon Jan 4 01:03:29 2010
@@ -19,7 +19,7 @@
import junit.framework.TestCase;
import org.apache.wicket.IRedirectListener;
-import org.apache.wicket.IRequestTarget;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.PageParameters;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -82,7 +82,7 @@
WicketTester tester = new WicketTester();
tester.setupRequestAndResponse();
TestPage page = new TestPage(null);
- IRequestTarget requestTarget = new ListenerInterfaceRequestTarget(page, page,
+ IRequestHandler requestTarget = new ListenerInterfaceRequestTarget(page, page,
IRedirectListener.INTERFACE);
strategy.encode(requestTarget);
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategyTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategyTest.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategyTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategyTest.java Mon Jan 4 01:03:29 2010
@@ -18,7 +18,7 @@
import java.math.BigDecimal;
-import org.apache.wicket.IRequestTarget;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.PageParameters;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.WebPage;
@@ -46,7 +46,7 @@
params.add("a", "1");
params.add("a", "2");
params.add("b", "1");
- IRequestTarget rt = new BookmarkablePageRequestTarget(TestPage.class, params);
+ IRequestHandler rt = new BookmarkablePageRequestTarget(TestPage.class, params);
String path = ucs.encode(rt).toString();
log.debug(path);
assertEquals("mount/point?a=1&a=2&b=1", path);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java?rev=895520&r1=895519&r2=895520&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java Mon Jan 4 01:03:29 2010
@@ -20,11 +20,11 @@
import junit.framework.TestCase;
-import org.apache.wicket.IRequestTarget;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.protocol.http.WebRequestCycle;
import org.apache.wicket.protocol.http.WebRequestCycleProcessor;
-import org.apache.wicket.protocol.http.request.WebErrorCodeResponseTarget;
+import org.apache.wicket.protocol.http.request.WebErrorCodeResponseHandler;
import org.apache.wicket.settings.ISecuritySettings;
import org.apache.wicket.util.lang.PackageName;
import org.apache.wicket.util.tester.WicketTester;
@@ -106,9 +106,9 @@
int getErrorCode(RequestCycle requestCycle)
{
- IRequestTarget requestTarget = requestCycle.getRequestTarget();
- assertTrue(requestTarget instanceof WebErrorCodeResponseTarget);
- WebErrorCodeResponseTarget error = (WebErrorCodeResponseTarget)requestTarget;
+ IRequestHandler requestTarget = requestCycle.getRequestTarget();
+ assertTrue(requestTarget instanceof WebErrorCodeResponseHandler);
+ WebErrorCodeResponseHandler error = (WebErrorCodeResponseHandler)requestTarget;
return error.getErrorCode();
}