[jboss-cvs] JBossAS SVN: r80479 - in projects/jboss-cl/branches/Branch_2_0: classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs and 2 other directories.

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

Author: alesj
Date: 2008-11-04 07:15:05 -0500 (Tue, 04 Nov 2008)
New Revision: 80479

Modified:
   projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoader.java
   projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/VFSResourceContext.java
   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/metadata/VFSClassLoaderFactory.java
Log:
Port trunk changes to branch.

Modified: projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoader.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoader.java	2008-11-04 12:01:45 UTC (rev 80478)
+++ projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoader.java	2008-11-04 12:15:05 UTC (rev 80479)
@@ -345,7 +345,7 @@
          log.trace(this + " already loaded class " + ClassLoaderUtils.classToString(result));
       return result;
    }
-   
+
    @Override
    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException
    {

Modified: projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/VFSResourceContext.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/VFSResourceContext.java	2008-11-04 12:01:45 UTC (rev 80478)
+++ projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/VFSResourceContext.java	2008-11-04 12:15:05 UTC (rev 80479)
@@ -30,7 +30,7 @@
 
 /**
  * VFS resource context.
- *
+ * 
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
 public class VFSResourceContext extends AbstractResourceContext

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	2008-11-04 12:01:45 UTC (rev 80478)
+++ projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java	2008-11-04 12:15:05 UTC (rev 80479)
@@ -167,7 +167,7 @@
             try
             {
                URI uri = new URI(root);
-               vfsRoots[i] = VFS.getRoot(uri);
+               vfsRoots[i] = getVirtualFile(uri);
             }
             catch (RuntimeException e)
             {
@@ -183,6 +183,18 @@
       return vfsRoots;
    }
 
+   /**
+    * Get virtual file for uri.
+    *
+    * @param uri the uri
+    * @return virtual file for uri
+    * @throws Exception for any error
+    */
+   protected VirtualFile getVirtualFile(URI uri) throws Exception
+   {
+      return VFS.getCachedFile(uri);
+   }
+
    @Override
    public VFSClassLoaderPolicy getPolicy()
    {

Modified: projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/metadata/VFSClassLoaderFactory.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/metadata/VFSClassLoaderFactory.java	2008-11-04 12:01:45 UTC (rev 80478)
+++ projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/metadata/VFSClassLoaderFactory.java	2008-11-04 12:15:05 UTC (rev 80479)
@@ -171,6 +171,16 @@
       this.roots = roots;
    }
 
+   /**
+    * Get module class.
+    *
+    * @return the module class.
+    */
+   protected Class<? extends VFSClassLoaderPolicyModule> getModuleClass()
+   {
+      return VFSClassLoaderPolicyModule.class;     
+   }
+
    @XmlTransient
    public List<BeanMetaData> getBeans()
    {
@@ -181,7 +191,7 @@
       String moduleName = contextName + "$MODULE";
       
       // Create the module
-      BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(moduleName, VFSClassLoaderPolicyModule.class.getName());
+      BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(moduleName, getModuleClass().getName());
       builder.addConstructorParameter(VFSClassLoaderFactory.class.getName(), this);
       builder.addConstructorParameter(String.class.getName(), moduleName);
       builder.addPropertyMetaData("roots", roots);