[jboss-cvs] JBossAS SVN: r76565 - in projects/jboss-cl/trunk/classloading-vfs/src: tests/org/jboss/test/classloading/vfs/metadata/test and 1 other directory.

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

Author: alesj
Date: 2008-08-01 07:17:55 -0400 (Fri, 01 Aug 2008)
New Revision: 76565

Modified:
   projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java
   projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java
Log:
Do exact match.

Modified: projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java	2008-08-01 10:23:22 UTC (rev 76564)
+++ projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java	2008-08-01 11:17:55 UTC (rev 76565)
@@ -248,20 +248,19 @@
    {
       try
       {
-         String[] rootURLStrings = new String[urls.length];
-         List<VirtualFile> newRoots = new ArrayList<VirtualFile>(urls.length);
-         for (URL url : urls)
+         String[] urlStrings = new String[urls.length];
+         List<VirtualFile> newRoots = new ArrayList<VirtualFile>(roots.length);
+         for (VirtualFile root : roots)
          {
-            String urlString = stripProtocol(url);
-            for(int i=0; i < roots.length; i++)
+            String rootUrlString = root.toURL().toExternalForm();
+            for(int i=0; i < urls.length; i++)
             {
-               if (rootURLStrings[i] == null)
-                  rootURLStrings[i] = stripProtocol(roots[i].toURL());
+               if (urlStrings[i] == null)
+                  urlStrings[i] = urls[i].toExternalForm();
 
-               if (urlString.startsWith(rootURLStrings[i]))
+               if (rootUrlString.equals(urlStrings[i]))
                {
-                  VirtualFile newRoot = VFS.getRoot(url);
-                  newRoots.add(newRoot);
+                  newRoots.add(root);
                   break;
                }
             }
@@ -273,20 +272,4 @@
          throw new RuntimeException("Cannot match urls to roots.", e);
       }
    }
-
-   /**
-    * Strip the url protocol.
-    *
-    * @param url the url
-    * @return url external form w/o protocol
-    */
-   protected static String stripProtocol(URL url)
-   {
-      if (url == null)
-         throw new IllegalArgumentException("Null url");
-
-      String urlString = url.toExternalForm();
-      int p = urlString.indexOf(":/");
-      return urlString.substring(p + 2);
-   }
 }

Modified: projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java	2008-08-01 10:23:22 UTC (rev 76564)
+++ projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java	2008-08-01 11:17:55 UTC (rev 76565)
@@ -287,7 +287,13 @@
    public void testUrlsParameter() throws Exception
    {
       VFSClassLoaderFactory factory = new VFSClassLoaderFactory("test");
-      factory.setRoots(Arrays.asList(System.getProperty("test.dir") + "/support/"));
+      factory.setRoots(
+            Arrays.asList(
+                  System.getProperty("test.dir") + "/support/a",
+                  System.getProperty("test.dir") + "/support/b",
+                  System.getProperty("test.dir") + "/support/c"
+            )
+      );
       KernelDeployment deployment = install(factory);
       try
       {
@@ -300,7 +306,7 @@
             }
          };
 
-         URL aURL = new URL(System.getProperty("test.dir") + "/support/a");
+         URL aURL = new URL("vfs" + System.getProperty("test.dir") + "/support/a/");
          Module module = assertModule("test:0.0.0");
          module.visit(visitor, visitor.getFilter(), null, aURL);
 
@@ -316,7 +322,13 @@
    public void testUrlsParameters() throws Exception
    {
       VFSClassLoaderFactory factory = new VFSClassLoaderFactory("test");
-      factory.setRoots(Arrays.asList(System.getProperty("test.dir") + "/support/"));
+      factory.setRoots(
+            Arrays.asList(
+                  System.getProperty("test.dir") + "/support/a",
+                  System.getProperty("test.dir") + "/support/b",
+                  System.getProperty("test.dir") + "/support/c"
+            )
+      );
       KernelDeployment deployment = install(factory);
       try
       {
@@ -329,8 +341,8 @@
             }
          };
 
-         URL aURL = new URL(System.getProperty("test.dir") + "/support/a");
-         URL bURL = new URL(System.getProperty("test.dir") + "/support/b");
+         URL aURL = new URL("vfs" + System.getProperty("test.dir") + "/support/a/");
+         URL bURL = new URL("vfs" + System.getProperty("test.dir") + "/support/b/");
          Module module = assertModule("test:0.0.0");
          module.visit(visitor, visitor.getFilter(), null, aURL, bURL);