[jboss-cvs] JBossAS SVN: r72346 - in projects/jboss-deployers/trunk/deployers-vfs/src: tests/org/jboss/test/deployers/vfs/classloader/test and 1 other directory.

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

Author: alesj
Date: 2008-04-17 09:01:57 -0400 (Thu, 17 Apr 2008)
New Revision: 72346

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/plugins/classloader/InMemoryClassesDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/InMemoryClasesUnitTestCase.java
Log:
MemoryFileFactory usage.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/plugins/classloader/InMemoryClassesDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/plugins/classloader/InMemoryClassesDeployer.java	2008-04-17 12:51:18 UTC (rev 72345)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/plugins/classloader/InMemoryClassesDeployer.java	2008-04-17 13:01:57 UTC (rev 72346)
@@ -30,8 +30,8 @@
 import org.jboss.deployers.vfs.spi.deployer.AbstractVFSRealDeployer;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.util.id.GUID;
+import org.jboss.virtual.MemoryFileFactory;
 import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.plugins.context.memory.MemoryContextFactory;
 
 /**
  * TempURLDeployer.
@@ -47,9 +47,6 @@
    /** The name of the dynamic class root */
    public static final String DYNAMIC_CLASS_KEY = "DYNAMIC_CLASS_KEY";
 
-   /** The memory context factory */
-   private MemoryContextFactory factory = MemoryContextFactory.getInstance();
-   
    /**
     * Create a new TempURLDeployer.
     */
@@ -67,9 +64,9 @@
       try
       {
          URL dynamicClassRoot = new URL("vfsmemory", new GUID().toString(), "");
-         factory.createRoot(dynamicClassRoot);
+         MemoryFileFactory.createRoot(dynamicClassRoot);
          URL classesURL = new URL(dynamicClassRoot, "classes");
-         VirtualFile classes = factory.createDirectory(classesURL).getVirtualFile();
+         VirtualFile classes = MemoryFileFactory.createDirectory(classesURL);
          unit.addAttachment(DYNAMIC_CLASS_URL_KEY, dynamicClassRoot);
          unit.addAttachment(DYNAMIC_CLASS_KEY, classes);
          unit.prependClassPath(classes);
@@ -104,7 +101,7 @@
          {
             URL root = unit.removeAttachment(DYNAMIC_CLASS_URL_KEY, URL.class);
             if (root != null)
-               factory.deleteRoot(root);
+               MemoryFileFactory.deleteRoot(root);
          }
          catch (Exception e)
          {

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/InMemoryClasesUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/InMemoryClasesUnitTestCase.java	2008-04-17 12:51:18 UTC (rev 72345)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/InMemoryClasesUnitTestCase.java	2008-04-17 13:01:57 UTC (rev 72346)
@@ -24,7 +24,6 @@
 import java.net.URL;
 
 import junit.framework.Test;
-
 import org.jboss.classloader.plugins.jdk.AbstractJDKChecker;
 import org.jboss.classloader.plugins.system.DefaultClassLoaderSystem;
 import org.jboss.classloader.spi.ClassLoaderSystem;
@@ -41,8 +40,8 @@
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.test.deployers.vfs.classloader.support.TestLevelClassLoaderSystemDeployer;
 import org.jboss.test.deployers.vfs.classloader.support.a.A;
+import org.jboss.virtual.MemoryFileFactory;
 import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.plugins.context.memory.MemoryContextFactory;
 
 /**
  * InMemoryClasesUnitTestCase.
@@ -90,9 +89,8 @@
       ClassLoader cl = unit.getClassLoader();
       assertNull(cl.getResource(resourceName));
       
-      MemoryContextFactory factory = MemoryContextFactory.getInstance();
       byte[] bytes = new byte[0];
-      factory.putFile(testResource, bytes);
+      MemoryFileFactory.putFile(testResource, bytes);
       assertEquals(testResource, cl.getResource(resourceName));
       
       mainDeployer.undeploy(ad);