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

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

Author: mstruk
Date: 2008-11-14 09:46:22 -0500 (Fri, 14 Nov 2008)
New Revision: 81043

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSUtilTestCase.java
Log:
JBVFS-77 VFS API exposure is done through VFSUtils.getRealURL()

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java	2008-11-14 14:25:31 UTC (rev 81042)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java	2008-11-14 14:46:22 UTC (rev 81043)
@@ -1046,7 +1046,6 @@
    public static URL getRealURL(VirtualFile file) throws IOException, URISyntaxException
    {
       VirtualFileHandler handler = file.getHandler();
-      // TODO - JBVFS-77
-      return handler.toVfsUrl();
+      return handler.getRealURL();
    }
 }

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java	2008-11-14 14:25:31 UTC (rev 81042)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java	2008-11-14 14:46:22 UTC (rev 81043)
@@ -211,7 +211,9 @@
          && ((AbstractVirtualFileHandler)peer).getLocalVFSContext() instanceof FileSystemContext)
       {
          String lpath = getLocalPathName();
-         return new URL("jar:file:" + ctx.getRootURI().getPath() + "!" + (lpath.length() == 0 ? "/" : lpath));
+         if (lpath.startsWith("/") == false)
+            lpath = "/" + lpath;
+         return new URL("jar:file:" + ctx.getRootURI().getPath() + "!" + lpath);
       }
 
       if (peer instanceof AbstractVirtualFileHandler)

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSUtilTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSUtilTestCase.java	2008-11-14 14:25:31 UTC (rev 81042)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSUtilTestCase.java	2008-11-14 14:46:22 UTC (rev 81043)
@@ -98,7 +98,7 @@
 	   assertTrue(vfsURL.toExternalForm().startsWith("vfszip"));
 	   URL realURL = VFSUtils.getRealURL(jarFile);
       // TODO - JBVFS-77 --> do proper tests!
-	   //assertTrue(realURL.toExternalForm().startsWith("jar:"));
+	   assertTrue(realURL.toExternalForm().startsWith("jar:"));
 	   
 	   //Nested file in a jar
 	   url = getResource("/vfs/test/nested");
@@ -106,7 +106,7 @@
 	   VirtualFile nestedFile = root.getChild("/nested.jar/META-INF/empty.txt");
 	   realURL = VFSUtils.getRealURL(nestedFile);
       // TODO - JBVFS-77 --> do proper tests!
-	   //assertTrue(realURL.toExternalForm().startsWith("jar:"));
+	   assertTrue(realURL.toExternalForm().startsWith("jar:"));
 	     
 	   //Regular file
 	   url = getResource("/vfs/context/file/simple");
@@ -115,6 +115,6 @@
 	   assertTrue(vfsURL.getProtocol().startsWith("vfsfile"));
 	   realURL = VFSUtils.getRealURL(regularFile);
       // TODO - JBVFS-77 --> do proper tests!
-	   //assertTrue(realURL.toExternalForm().startsWith("file:"));
+	   assertTrue(realURL.toExternalForm().startsWith("file:"));
    }
 }
\ No newline at end of file