[jboss-cvs] JBossAS SVN: r58368 - in projects/microcontainer/trunk/container/src: main/org/jboss/virtual/plugins/context/jar tests/org/jboss/test/virtual/test

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

Author: jason.greene at jboss.com
Date: 2006-11-14 19:23:14 -0500 (Tue, 14 Nov 2006)
New Revision: 58368

Modified:
   projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/jar/AbstractJarHandler.java
   projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/FileVFSUnitTestCase.java
Log:
Fix packed jar directory URLs


Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/jar/AbstractJarHandler.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/jar/AbstractJarHandler.java	2006-11-14 23:42:11 UTC (rev 58367)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/jar/AbstractJarHandler.java	2006-11-15 00:23:14 UTC (rev 58368)
@@ -357,6 +357,9 @@
       }
       else
       {
+         // Jar directory URLs must end in /
+         if (entry.isDirectory())
+            url = new URL(url.toString() + "/");
          vfh = new JarEntryHandler(context, parent, jar, entry, entryName, url);
       }
 

Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/FileVFSUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/FileVFSUnitTestCase.java	2006-11-14 23:42:11 UTC (rev 58367)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/FileVFSUnitTestCase.java	2006-11-15 00:23:14 UTC (rev 58368)
@@ -789,6 +789,10 @@
             jar1URL.getPath().endsWith("unpacked-outer.jar/jar1.jar!/"));
       VirtualFile jar1 = outerJar.findChild("jar1.jar");
       assertEquals(jar1URL, jar1.toURL());
+
+      VirtualFile packedJar = vfs.findChild("jar1.jar");
+      jar1URL = packedJar.findChild("org/jboss/test/vfs/support").toURL();
+      assertTrue("Jar directory entry URLs must end in /: " + jar1URL.toString(), jar1URL.toString().endsWith("/"));
    }
 
    /**