[jboss-cvs] JBossAS SVN: r58629 - in projects/microcontainer/trunk/container/src/main/org/jboss/virtual: . plugins/context plugins/context/file

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2006-11-19 02:12:53 -0500 (Sun, 19 Nov 2006)
New Revision: 58629

Modified:
   projects/microcontainer/trunk/container/src/main/org/jboss/virtual/VFSUtils.java
   projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/AbstractURLHandler.java
   projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/FileSystemContext.java
Log:
Add a utils toURI method to replace spaces in urls

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/VFSUtils.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/VFSUtils.java	2006-11-19 07:05:16 UTC (rev 58628)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/VFSUtils.java	2006-11-19 07:12:53 UTC (rev 58629)
@@ -340,4 +340,20 @@
          info.add(link);
       }
    }
+
+   /**
+    * Deal with urls that may include spaces.
+    * 
+    * @param url
+    * @return uri
+    */
+   public static URI toURI(URL url)
+      throws URISyntaxException
+   {
+      String urispec = url.toExternalForm();
+      // Escape any spaces
+      urispec = urispec.replaceAll(" ", "%20");
+      URI uri = new URI(urispec);
+      return uri;
+   }
 }

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/AbstractURLHandler.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/AbstractURLHandler.java	2006-11-19 07:05:16 UTC (rev 58628)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/AbstractURLHandler.java	2006-11-19 07:12:53 UTC (rev 58629)
@@ -29,6 +29,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 
+import org.jboss.virtual.VFSUtils;
 import org.jboss.virtual.spi.VFSContext;
 import org.jboss.virtual.spi.VirtualFileHandler;
 
@@ -106,10 +107,6 @@
 
    public URI toURI() throws URISyntaxException
    {
-      String urispec = url.toExternalForm();
-      // Escape any spaces
-      urispec = urispec.replaceAll(" ", "%20");
-      URI uri = new URI(urispec);
-      return uri;
+      return VFSUtils.toURI(url);
    }
 }

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/FileSystemContext.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/FileSystemContext.java	2006-11-19 07:05:16 UTC (rev 58628)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/FileSystemContext.java	2006-11-19 07:12:53 UTC (rev 58629)
@@ -110,7 +110,7 @@
     */
    public FileSystemContext(URL rootURL) throws IOException, URISyntaxException
    {
-      this(rootURL.toURI());
+      this(VFSUtils.toURI(rootURL));
    }
 
    /**