You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2006/10/15 15:28:09 UTC
svn commit: r464188 - in /incubator/wicket/trunk/wicket/src/main/java/wicket:
protocol/http/request/AbstractWebRequestCodingStrategy.java
util/string/Strings.java
Author: ehillenius
Date: Sun Oct 15 06:28:08 2006
New Revision: 464188
URL: http://svn.apache.org/viewvc?view=rev&rev=464188
Log:
fixed bug that prevented cookieless operation & formatted
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/AbstractWebRequestCodingStrategy.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/string/Strings.java
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/AbstractWebRequestCodingStrategy.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/AbstractWebRequestCodingStrategy.java?view=diff&rev=464188&r1=464187&r2=464188
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/AbstractWebRequestCodingStrategy.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/AbstractWebRequestCodingStrategy.java Sun Oct 15 06:28:08 2006
@@ -34,6 +34,7 @@
import wicket.RequestListenerInterface;
import wicket.Session;
import wicket.WicketRuntimeException;
+import wicket.protocol.http.portlet.PortletRequestCodingStrategy;
import wicket.request.IRequestCodingStrategy;
import wicket.request.RequestParameters;
import wicket.request.target.coding.IRequestTargetUrlCodingStrategy;
@@ -44,6 +45,7 @@
import wicket.request.target.resource.ISharedResourceRequestTarget;
import wicket.util.string.AppendingStringBuffer;
import wicket.util.string.Strings;
+
/**
* Request parameters factory implementation helper class
*
@@ -84,8 +86,9 @@
{
final RequestParameters parameters = new RequestParameters();
String pathInfo = getRequestPath(request);
- if (pathInfo!=null&&!pathInfo.startsWith("/")) {
- pathInfo="/"+pathInfo;
+ if (pathInfo != null && !pathInfo.startsWith("/"))
+ {
+ pathInfo = "/" + pathInfo;
}
parameters.setPath(pathInfo);
parameters.setPageMapName(request.getParameter(PAGEMAP));
@@ -110,7 +113,6 @@
}
-
/**
* @see wicket.request.IRequestCodingStrategy#targetForRequest(wicket.request.RequestParameters)
*/
@@ -237,26 +239,16 @@
String pathInfo = request.getPath();
if (pathInfo != null)
{
- if (pathInfo.startsWith("/")) {
- pathInfo=pathInfo.substring(1);
+ if (pathInfo.startsWith("/"))
+ {
+ pathInfo = pathInfo.substring(1);
}
if (pathInfo.startsWith("resources/"))
{
int ix = "resources/".length();
if (pathInfo.length() > ix)
{
- StringBuilder path = new StringBuilder(pathInfo.substring(ix));
- int ixSemiColon = path.indexOf(";");
- // strip off any jsession id
- if (ixSemiColon != -1)
- {
- int ixEnd = path.indexOf("?");
- if (ixEnd == -1)
- {
- ixEnd = path.length();
- }
- path.delete(ixSemiColon, ixEnd);
- }
+ String path = pathInfo.substring(ix);
parameters.setResourceKey(path.toString());
}
}
@@ -441,8 +433,9 @@
buffer.append("/resources/");
}
buffer.append(sharedResourceKey);
- Map<String,? extends Object> map = requestTarget.getRequestParameters().getParameters();
- if(map != null && map.size() > 0)
+ Map<String, ? extends Object> map = requestTarget.getRequestParameters()
+ .getParameters();
+ if (map != null && map.size() > 0)
{
buffer.append('?');
for (String key : map.keySet())
@@ -452,7 +445,7 @@
buffer.append(map.get(key));
buffer.append('&');
}
- buffer.setLength(buffer.length()-1);
+ buffer.setLength(buffer.length() - 1);
}
return requestCycle.getOriginalResponse().encodeURL(buffer);
}
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/util/string/Strings.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/util/string/Strings.java?view=diff&rev=464188&r1=464187&r2=464188
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/util/string/Strings.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/util/string/Strings.java Sun Oct 15 06:28:08 2006
@@ -801,6 +801,31 @@
}
/**
+ * Strip any jsessionid and possibly other redundant info that might be in
+ * our way.
+ *
+ * @param url
+ * The url to strip
+ * @return The stripped url
+ */
+ public static String stripJSessionId(CharSequence url)
+ {
+ StringBuilder path = new StringBuilder(url);
+ int ixSemiColon = path.indexOf(";");
+ // strip off any jsession id
+ if (ixSemiColon != -1)
+ {
+ int ixEnd = path.indexOf("?");
+ if (ixEnd == -1)
+ {
+ ixEnd = path.length();
+ }
+ path.delete(ixSemiColon, ixEnd);
+ }
+ return path.toString();
+ }
+
+ /**
* Converts unicodes to encoded \uxxxx.
*
* @param unicodeString