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

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

Author: alesj
Date: 2010-05-11 18:08:24 -0400 (Tue, 11 May 2010)
New Revision: 104697

Modified:
   projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java
   projects/jboss-cl/trunk/pom.xml
Log:
Update to VFS3.0.0.CR5.

Modified: projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java	2010-05-11 21:50:23 UTC (rev 104696)
+++ projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java	2010-05-11 22:08:24 UTC (rev 104697)
@@ -24,17 +24,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.ArrayList;
+import java.util.*;
 
-import junit.framework.Test;
 import org.jboss.classloader.plugins.ClassLoaderUtils;
 import org.jboss.classloading.plugins.visitor.FederatedResourceVisitor;
 import org.jboss.classloading.spi.dependency.Module;
@@ -48,7 +39,11 @@
 import org.jboss.test.classloading.vfs.metadata.support.a.A;
 import org.jboss.test.classloading.vfs.metadata.support.b.B;
 import org.jboss.test.classloading.vfs.metadata.support.c.C;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
 
+import junit.framework.Test;
+
 /**
  * VFSResourceVisitorUnitTestCase.
  *
@@ -310,8 +305,9 @@
          };
 
          URL aURL = new URL(System.getProperty("test.dir") + "/support/a/");
+         VirtualFile root = VFS.getChild(aURL);
          Module module = assertModule("test:0.0.0");
-         module.visit(visitor, visitor.getFilter(), null, aURL);
+         module.visit(visitor, visitor.getFilter(), null, root.toURL());
 
          assertEquals(1, classes.size());
          assertEquals(classes.iterator().next(), A.class.getSimpleName() + ".class");
@@ -345,9 +341,11 @@
          };
 
          URL aURL = new URL(System.getProperty("test.dir") + "/support/a/");
+         VirtualFile rootA = VFS.getChild(aURL);
          URL bURL = new URL(System.getProperty("test.dir") + "/support/b/");
+         VirtualFile rootB = VFS.getChild(bURL);
          Module module = assertModule("test:0.0.0");
-         module.visit(visitor, visitor.getFilter(), null, aURL, bURL);
+         module.visit(visitor, visitor.getFilter(), null, rootA.toURL(), rootB.toURL());
 
          assertEquals(2, classes.size());
          Iterator<String> iterator = classes.iterator();

Modified: projects/jboss-cl/trunk/pom.xml
===================================================================
--- projects/jboss-cl/trunk/pom.xml	2010-05-11 21:50:23 UTC (rev 104696)
+++ projects/jboss-cl/trunk/pom.xml	2010-05-11 22:08:24 UTC (rev 104697)
@@ -30,7 +30,7 @@
   </modules>
   
   <properties>
-    <version.jboss.vfs>3.0.0.CR3</version.jboss.vfs>
+    <version.jboss.vfs>3.0.0.CR5</version.jboss.vfs>
     <version.jboss.man>2.1.1.SP1</version.jboss.man>
     <version.jboss.mdr>2.2.0.Alpha2</version.jboss.mdr>
     <version.jboss.kernel>2.2.0.Alpha10</version.jboss.kernel>