[PATCH] PersistentDocument.java: use '(' instead of '.' injetspeed-cache, use '/' instead of System.getProperty("file.separator")[Ed Knutson]

[Ed Knutson]

--- /projects/jetspeed/src/java/org/apache/jetspeed/cache/PersistentDocument.java      
 Fri Mar 24 10:22:57 2000
+++ PersistentDocument.java     Fri Mar 31 15:08:21 2000
@@ -152,9 +152,9 @@
         
         for ( int i = 0; i < files.length; ++i ) {
             
-            if ( files[i].indexOf("http.") == 0 )  {
+            if ( files[i].indexOf("http(") == 0 )  {
                 entries.addElement( new PersistentDocumentEntry( getCacheDirectory() 
+ 
-                                    System.getProperty("file.separator") + 
+                                   "/" +
                                     files[i] ) );
             }
             
@@ -263,18 +263,18 @@
         
         will be changed to:
         
-        http.www.apache.org...80.index..html
+        http(www(apache(org(((80(index((html
         
-        - all "." are translated as ".."
-        - a ":" is translated as "..."
+        - all "." are translated as "(("
+        - a ":" is translated as "((("
         
         */
         
         
-        url = Util.globalStringReplace( url, ".", ".." );
-        url = Util.globalStringReplace( url, "://", "." );
-        url = Util.globalStringReplace( url, "/", "." );
-        url = Util.globalStringReplace( url, ":", "..." );
+        url = Util.globalStringReplace( url, ".", "((" );
+        url = Util.globalStringReplace( url, "://", "(" );
+        url = Util.globalStringReplace( url, "/", "(" );
+        url = Util.globalStringReplace( url, ":", "(((" );
 
         
         //NOTE:  get rid of any CGI params... if users are generating
@@ -292,17 +292,17 @@
         String url = "";
 
 
-        int start = cache.indexOf(".");
+        int start = cache.indexOf("(");
         
         String protocol = cache.substring( 0, start );
         
         String uri = cache.substring( start + 1, cache.length() );
 
 
-        uri = Util.globalStringReplace( uri, "...", ":" );
+        uri = Util.globalStringReplace( uri, "(((", ":" );
 
-        uri = Util.globalStringReplace( uri, ".", "/" );
-        uri = Util.globalStringReplace( uri, ".", "/" );
+        uri = Util.globalStringReplace( uri, "(", "/" );
+        uri = Util.globalStringReplace( uri, "(", "/" );
         
         //now the original ".." should be slashes so replace them with a single "."
         uri = Util.globalStringReplace( uri, "//", "." );
@@ -324,7 +324,7 @@
 
       url = getURLCacheName( url );
 
-      url = getCacheDirectory() + System.getProperty("file.separator") + url;
+      url = getCacheDirectory() + "/" + url;
 
       return url;
     }
--- /projects/jetspeed/src/java/org/apache/jetspeed/cache/PersistentDocument.java      
 Fri Mar 24 10:22:57 2000
+++ PersistentDocument.java     Fri Mar 31 15:08:21 2000
@@ -152,9 +152,9 @@
         
         for ( int i = 0; i < files.length; ++i ) {
             
-            if ( files[i].indexOf("http.") == 0 )  {
+            if ( files[i].indexOf("http(") == 0 )  {
                 entries.addElement( new PersistentDocumentEntry( getCacheDirectory() 
+ 
-                                    System.getProperty("file.separator") + 
+                                   "/" +
                                     files[i] ) );
             }
             
@@ -263,18 +263,18 @@
         
         will be changed to:
         
-        http.www.apache.org...80.index..html
+        http(www(apache(org(((80(index((html
         
-        - all "." are translated as ".."
-        - a ":" is translated as "..."
+        - all "." are translated as "(("
+        - a ":" is translated as "((("
         
         */
         
         
-        url = Util.globalStringReplace( url, ".", ".." );
-        url = Util.globalStringReplace( url, "://", "." );
-        url = Util.globalStringReplace( url, "/", "." );
-        url = Util.globalStringReplace( url, ":", "..." );
+        url = Util.globalStringReplace( url, ".", "((" );
+        url = Util.globalStringReplace( url, "://", "(" );
+        url = Util.globalStringReplace( url, "/", "(" );
+        url = Util.globalStringReplace( url, ":", "(((" );
 
         
         //NOTE:  get rid of any CGI params... if users are generating
@@ -292,17 +292,17 @@
         String url = "";
 
 
-        int start = cache.indexOf(".");
+        int start = cache.indexOf("(");
         
         String protocol = cache.substring( 0, start );
         
         String uri = cache.substring( start + 1, cache.length() );
 
 
-        uri = Util.globalStringReplace( uri, "...", ":" );
+        uri = Util.globalStringReplace( uri, "(((", ":" );
 
-        uri = Util.globalStringReplace( uri, ".", "/" );
-        uri = Util.globalStringReplace( uri, ".", "/" );
+        uri = Util.globalStringReplace( uri, "(", "/" );
+        uri = Util.globalStringReplace( uri, "(", "/" );
         
         //now the original ".." should be slashes so replace them with a single "."
         uri = Util.globalStringReplace( uri, "//", "." );
@@ -324,7 +324,7 @@
 
       url = getURLCacheName( url );
 
-      url = getCacheDirectory() + System.getProperty("file.separator") + url;
+      url = getCacheDirectory() + "/" + url;
 
       return url;
     }


--
--------------------------------------------------------------
Please read the FAQ! <http://java.apache.org/faq/>
To subscribe:        [EMAIL PROTECTED]
To unsubscribe:      [EMAIL PROTECTED]
Archives and Other:  <http://java.apache.org/main/mail.html>
Problems?:           [EMAIL PROTECTED]