[jboss-cvs] JBossAS SVN: r77278 - 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-08-21 05:16:21 -0400 (Thu, 21 Aug 2008)
New Revision: 77278

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:
[JBDEPLOY-75]; move im-memory classes directory to root.

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-08-21 09:08:36 UTC (rev 77277)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/plugins/classloader/InMemoryClassesDeployer.java	2008-08-21 09:16:21 UTC (rev 77278)
@@ -63,10 +63,8 @@
    {
       try
       {
-         URL dynamicClassRoot = new URL("vfsmemory", new GUID().toString(), "");
-         MemoryFileFactory.createRoot(dynamicClassRoot);
-         URL classesURL = new URL(dynamicClassRoot, "classes");
-         VirtualFile classes = MemoryFileFactory.createDirectory(classesURL);
+         URL dynamicClassRoot = new URL("vfsmemory", GUID.asString() + "/classes", "");
+         VirtualFile classes = MemoryFileFactory.createRoot(dynamicClassRoot).getRoot();
          unit.addAttachment(DYNAMIC_CLASS_URL_KEY, dynamicClassRoot);
          unit.addAttachment(DYNAMIC_CLASS_KEY, classes);
          unit.prependClassPath(classes);

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-08-21 09:08:36 UTC (rev 77277)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/InMemoryClasesUnitTestCase.java	2008-08-21 09:16:21 UTC (rev 77278)
@@ -81,18 +81,20 @@
 
       URL root = unit.getAttachment(InMemoryClassesDeployer.DYNAMIC_CLASS_URL_KEY, URL.class);
       assertNotNull(root);
-      URL classes = new URL(root, "classes");
       
       String aPackage = A.class.getPackage().getName();
       aPackage = aPackage.replace(".", "/");
       String resourceName = aPackage + "/TestInMemory";
-      URL testResource = new URL(classes + "/" + resourceName);
+      URL testResource = new URL(root, resourceName);
       ClassLoader cl = unit.getClassLoader();
       assertNull(cl.getResource(resourceName));
       
       byte[] bytes = new byte[0];
       MemoryFileFactory.putFile(testResource, bytes);
-      assertEquals(testResource, cl.getResource(resourceName));
+      URL resource = cl.getResource(resourceName);
+      assertNotNull(resource);
+      // dunno why direct URL equals fails?
+      assertEquals(testResource.toExternalForm(), resource.toExternalForm());
       
       mainDeployer.undeploy(ad);
       mainDeployer.checkComplete();