[jboss-cvs] JBossAS SVN: r84388 - in projects/vfs/trunk/src/main/java/org/jboss/virtual: plugins/context/jar and 2 other directories.

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

Author: alesj
Date: 2009-02-18 10:53:39 -0500 (Wed, 18 Feb 2009)
New Revision: 84388

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileSystemContext.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarHandler.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/protocol/AbstractVFSHandler.java
Log:
[JBVFS-89]; get URL over URI.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileSystemContext.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileSystemContext.java	2009-02-18 15:26:55 UTC (rev 84387)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileSystemContext.java	2009-02-18 15:53:39 UTC (rev 84388)
@@ -238,7 +238,7 @@
          {
             try
             {
-               return new JarHandler(this, parent, file, file.toURL(), name);
+               return new JarHandler(this, parent, file, file.toURI().toURL(), name);
             }
             catch(IOException e)
             {
@@ -273,7 +273,7 @@
    protected DelegatingHandler mountZipFS(VirtualFileHandler parent, String name, File file) throws IOException, URISyntaxException
    {
       DelegatingHandler delegator = new DelegatingHandler(this, parent, name);
-      URL fileUrl = file.toURL();
+      URL fileUrl = file.toURI().toURL();
       URL delegatorUrl = fileUrl;
 
       if (parent != null)

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarHandler.java	2009-02-18 15:26:55 UTC (rev 84387)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarHandler.java	2009-02-18 15:53:39 UTC (rev 84388)
@@ -130,7 +130,7 @@
    protected NestedJarHandler(VFSContext context, VirtualFileHandler parent, JarFile parentJar, ZipEntry entry, URL original, File temp, String entryName)
       throws IOException
    {
-      super(context, parent, temp.toURL(), createTempJar(temp, parentJar, entry), entry, entryName);
+      super(context, parent, temp.toURI().toURL(), createTempJar(temp, parentJar, entry), entry, entryName);
 
       try
       {

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java	2009-02-18 15:26:55 UTC (rev 84387)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java	2009-02-18 15:53:39 UTC (rev 84388)
@@ -319,7 +319,7 @@
    {
       File file = null;
       String relative = null;
-      File fp = new File(rootPath);
+      File fp = new File(VFSUtils.decode(rootPath));
       if (fp.exists())
       {
          file = fp;
@@ -646,7 +646,7 @@
    protected DelegatingHandler mountZipFile(VirtualFileHandler parent, String name, File file) throws IOException, URISyntaxException
    {
       DelegatingHandler delegator = new DelegatingHandler(this, parent, name);
-      URL fileUrl = file.toURL();
+      URL fileUrl = file.toURI().toURL();
       URL delegatorUrl = fileUrl;
 
       if (parent != null)
@@ -1402,7 +1402,7 @@
 
       RealURLInfo(File file) throws MalformedURLException
       {
-         String url = file.toURL().toExternalForm();
+         String url = file.toURI().toURL().toExternalForm();
          if (url.endsWith("/"))
             url = url.substring(0, url.length()-1);
          rootURL = "jar:" + url + "!/";

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/protocol/AbstractVFSHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/protocol/AbstractVFSHandler.java	2009-02-18 15:26:55 UTC (rev 84387)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/protocol/AbstractVFSHandler.java	2009-02-18 15:53:39 UTC (rev 84388)
@@ -82,7 +82,7 @@
       File fp = new File(file);
       if (fp.exists())
       {
-         vfsurl = fp.getParentFile().toURL();
+         vfsurl = fp.getParentFile().toURI().toURL();
          relative = fp.getName();
       }
       else
@@ -93,7 +93,7 @@
          {
             if (curr.exists())
             {
-               vfsurl = curr.toURL();
+               vfsurl = curr.toURI().toURL();
                break;
             }
             else