[jboss-cvs] JBossAS SVN: r83482 - in projects/jboss-cl/branches/Branch_2_0: classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency and 1 other directory.

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

Author: alesj
Date: 2009-01-27 08:10:30 -0500 (Tue, 27 Jan 2009)
New Revision: 83482

Modified:
   projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java
   projects/jboss-cl/branches/Branch_2_0/pom.xml
Log:
Update libs, fix vfs usage.

Modified: projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java	2009-01-27 13:06:45 UTC (rev 83481)
+++ projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java	2009-01-27 13:10:30 UTC (rev 83482)
@@ -45,7 +45,7 @@
 
 /**
  * VFSClassLoaderPolicyModule.
- * 
+ *
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
@@ -56,13 +56,13 @@
 
    /** The roots */
    private List<String> roots;
-   
+
    /** Our cached vfs roots */
    private VirtualFile[] vfsRoots;
 
    /**
     * Create a new VFSClassLoaderPolicyModule.
-    * 
+    *
     * @param classLoadingMetaData the classloading metadata
     * @param contextName the context name
     */
@@ -70,10 +70,10 @@
    {
       super(classLoadingMetaData, contextName);
    }
-   
+
    /**
     * Get the roots.
-    * 
+    *
     * @return the roots.
     */
    public List<String> getRoots()
@@ -83,7 +83,7 @@
 
    /**
     * Set the roots.
-    * 
+    *
     * @param roots the roots.
     */
    public void setRoots(List<String> roots)
@@ -100,7 +100,7 @@
       List<Capability> capabilities = super.determineCapabilities();
       if (capabilities != null)
          return capabilities;
-         
+
       // We need to work it out
       ClassLoadingMetaDataFactory factory = ClassLoadingMetaDataFactory.getInstance();
       capabilities = new CopyOnWriteArrayList<Capability>();
@@ -109,7 +109,7 @@
       Object version = getVersion();
       Capability capability = factory.createModule(getName(), version);
       capabilities.add(capability);
-      
+
       // Do we determine package capabilities
       ClassFilter included = getIncluded();
       ClassFilter excluded = getExcluded();
@@ -124,7 +124,7 @@
             capabilities.add(capability);
          }
       }
-      
+
       return capabilities;
    }
 
@@ -143,17 +143,17 @@
    {
       return (VFSClassLoaderFactory) super.getClassLoadingMetaData();
    }
-   
+
    /**
     * Get the virtual file roots
-    * 
+    *
     * @return the roots
     */
    protected VirtualFile[] determineVFSRoots()
    {
       if (vfsRoots != null)
          return vfsRoots;
-      
+
       if (roots == null)
       {
          vfsRoots = new VirtualFile[0];
@@ -193,9 +193,9 @@
    protected VirtualFile getVirtualFile(URI uri) throws Exception
    {
       if (isCacheable())
-         return VFS.getCachedFile(uri);
+         return VFS.getRoot(uri);
       else
-         return VFS.getRoot(uri);
+         return VFS.createNewRoot(uri);
    }
 
    @Override
@@ -203,13 +203,13 @@
    {
       return (VFSClassLoaderPolicy) super.getPolicy();
    }
-   
+
    @Override
    protected VFSClassLoaderPolicy determinePolicy()
    {
       VirtualFile[] roots = determineVFSRoots();
       VFSClassLoaderPolicy policy = VFSClassLoaderPolicy.createVFSClassLoaderPolicy(getContextName(), roots);
-      
+
       String[] packageNames = getPackageNames();
       policy.setExportedPackages(packageNames);
       policy.setIncluded(getIncluded());
@@ -244,5 +244,5 @@
          ClassFilter excluded = getExcluded();
          VFSResourceVisitor.visit(roots, null, included, excluded, classLoader, visitor, filter, recurseFilter, urls);
       }
-   } 
+   }
 }

Modified: projects/jboss-cl/branches/Branch_2_0/pom.xml
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/pom.xml	2009-01-27 13:06:45 UTC (rev 83481)
+++ projects/jboss-cl/branches/Branch_2_0/pom.xml	2009-01-27 13:10:30 UTC (rev 83482)
@@ -28,12 +28,12 @@
   </modules>
   
   <properties>
+    <version.jboss.vfs>2.0.1.GA</version.jboss.vfs>
     <version.jboss.man>2.0.0.GA</version.jboss.man>
-    <version.jboss.microcontainer>2.0.0.GA</version.jboss.microcontainer>
-    <version.jboss.common.core>2.2.9.GA</version.jboss.common.core>
+    <version.jboss.microcontainer>2.0.3.GA</version.jboss.microcontainer>
+    <version.jboss.common.core>2.2.10.GA</version.jboss.common.core>
     <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
     <version.jboss.classloading.spi>5.0.3.GA</version.jboss.classloading.spi>
-    <version.jboss.vfs>2.0.0.GA</version.jboss.vfs>
     <version.jbossxb>2.0.0.GA</version.jbossxb>
     <version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
     <version.junit>4.4</version.junit>