svn commit: r657879 - in /wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket: SharedResources.java request/target/resource/SharedResourceRequestTarget.java

[gseitz]

Author: gseitz
Date: Mon May 19 10:38:36 2008
New Revision: 657879

URL: http://svn.apache.org/viewvc?rev=657879&view=rev
Log:
WICKET-1428: use Strings.replaceAll instead of String.replace (Java5+)

Modified:
    
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/SharedResources.java
    
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java

Modified: 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/SharedResources.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/SharedResources.java?rev=657879&r1=657878&r2=657879&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/SharedResources.java
 (original)
+++ 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/SharedResources.java
 Mon May 19 10:38:36 2008
@@ -24,6 +24,7 @@
 
 import org.apache.wicket.util.file.Files;
 import org.apache.wicket.util.string.AppendingStringBuffer;
+import org.apache.wicket.util.string.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -62,7 +63,8 @@
 
                final String extension = Files.extension(path);
                // get relative path to resource, replace' ..' with escape 
sequence
-               final String basePath = Files.basePath(path, 
extension).replace("../", parentEscape + "/");
+               String basePath = Files.basePath(path, extension);
+               basePath = Strings.replaceAll(basePath, "../", parentEscape + 
"/").toString();
                final AppendingStringBuffer buffer = new 
AppendingStringBuffer(basePath.length() + 16);
                buffer.append(basePath);
 

Modified: 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java?rev=657879&r1=657878&r2=657879&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java
 (original)
+++ 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java
 Mon May 19 10:38:36 2008
@@ -28,6 +28,7 @@
 import org.apache.wicket.markup.html.PackageResource;
 import org.apache.wicket.protocol.http.WebResponse;
 import org.apache.wicket.request.RequestParameters;
+import org.apache.wicket.util.string.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -151,7 +152,8 @@
                                                .getParentFolderPlaceholder();
                                        // get path component of resource key, 
replace' ..' with escape sequence to
                                        // prevent crippled urls in browser
-                                       String path = resourceKey.substring(ix 
+ 1).replace(escapeString, "..");
+                                       String path = resourceKey.substring(ix 
+ 1);
+                                       path = Strings.replaceAll(path, 
escapeString, "..").toString();
 
                                        if (PackageResource.exists(scope, path, 
null, null))
                                        {