[jboss-cvs] JBossAS SVN: r97804 - in projects/jboss-deployers/trunk: deployers-vfs and 2 other directories.

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

Author: flavia.rainone at jboss.com
Date: 2009-12-14 15:01:20 -0500 (Mon, 14 Dec 2009)
New Revision: 97804

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/pom.xml
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ClassPoolTest.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/reflect/test/ClassPoolTestCase.xml
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/reflect/test/JavassistTypeInfoTestCase.xml
   projects/jboss-deployers/trunk/pom.xml
Log:
[JBREFLECT-75] Updated references from deployers-vfs to JBoss ClassPool

Modified: projects/jboss-deployers/trunk/deployers-vfs/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/pom.xml	2009-12-14 19:42:31 UTC (rev 97803)
+++ projects/jboss-deployers/trunk/deployers-vfs/pom.xml	2009-12-14 20:01:20 UTC (rev 97804)
@@ -290,8 +290,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-classpool</artifactId>
+      <groupId>org.jboss.classpool</groupId>
+      <artifactId>jboss-classpool-jbosscl</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ClassPoolTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ClassPoolTest.java	2009-12-14 19:42:31 UTC (rev 97803)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ClassPoolTest.java	2009-12-14 20:01:20 UTC (rev 97804)
@@ -88,6 +88,7 @@
             ClassPool classPool = classPoolRepository.registerClassLoader(classLoader);
             assertNotNull("ClassPool for " + classLoader + " is null", classPool);
             CtClass ctClass = classPool.getCtClass(className);
+            assertNotNull("Class" + className + " retrieved from pool " + classPool + " is null", ctClass);
             assertEquals(className, clazz.getName());
             ClassLoader cl = ctClass.getClassPool().getClassLoader();
             assertEquals("Class has been loaded by the wrong class loader: " + clazz.getName(), loadedClass.getClassLoader(), cl);

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/reflect/test/ClassPoolTestCase.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/reflect/test/ClassPoolTestCase.xml	2009-12-14 19:42:31 UTC (rev 97803)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/reflect/test/ClassPoolTestCase.xml	2009-12-14 20:01:20 UTC (rev 97804)
@@ -4,11 +4,11 @@
   <bean name="WarStructure" class="org.jboss.test.deployers.vfs.structure.war.support.MockWarStructureDeployer"/>
   <bean name="WarClassLoader" class="org.jboss.test.deployers.vfs.reflect.support.MockWarClassLoaderDeployer"/>
 
-  <bean name="ClassLoaderScopingPolicy" class="org.jboss.classpool.plugins.as5.VFSClassLoaderDomainRegistry">
+  <bean name="ClassLoaderScopingPolicy" class="org.jboss.classpool.plugins.jbosscl.VFSClassLoaderDomainRegistry">
      <constructor factoryMethod="getInstance"/>
    </bean>
 
-  <bean name="RegisterModuleCallback" class="org.jboss.classpool.plugins.as5.RegisterModuleCallback">
+  <bean name="RegisterModuleCallback" class="org.jboss.classpool.plugins.jbosscl.RegisterModuleCallback">
      <constructor>
        <parameter><inject bean="ClassLoaderScopingPolicy"/></parameter>
      </constructor>
@@ -20,14 +20,14 @@
      </uninstall>
   </bean>
 
-  <bean name="ClassPoolFactory" class="org.jboss.classpool.plugins.as5.jbosscl.JBossClDelegatingClassPoolFactory">
+  <bean name="ClassPoolFactory" class="org.jboss.classpool.plugins.jbosscl.JBossClDelegatingClassPoolFactory">
      <constructor>
         <parameter><inject bean="ClassLoaderScopingPolicy"/></parameter>
         <parameter><inject bean="RegisterModuleCallback"/></parameter>
      </constructor>
   </bean>
 
-  <bean name="ClassPoolRepository" class="org.jboss.classpool.plugins.as5.jbosscl.JBossClDelegatingClassPoolRepository">
+  <bean name="ClassPoolRepository" class="org.jboss.classpool.plugins.jbosscl.JBossClDelegatingClassPoolRepository">
      <constructor factoryMethod="getInstance"/>
      <property name="classPoolFactory"><inject bean="ClassPoolFactory"/></property>
   </bean>

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/reflect/test/JavassistTypeInfoTestCase.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/reflect/test/JavassistTypeInfoTestCase.xml	2009-12-14 19:42:31 UTC (rev 97803)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/reflect/test/JavassistTypeInfoTestCase.xml	2009-12-14 20:01:20 UTC (rev 97804)
@@ -4,11 +4,11 @@
   <bean name="WarStructure" class="org.jboss.test.deployers.vfs.structure.war.support.MockWarStructureDeployer"/>
   <bean name="WarClassLoader" class="org.jboss.test.deployers.vfs.reflect.support.MockWarClassLoaderDeployer"/>
 
-  <bean name="ClassLoaderScopingPolicy" class="org.jboss.classpool.plugins.as5.VFSClassLoaderDomainRegistry">
+  <bean name="ClassLoaderScopingPolicy" class="org.jboss.classpool.plugins.jbosscl.VFSClassLoaderDomainRegistry">
      <constructor factoryMethod="getInstance"/>
   </bean>
 
-  <bean name="RegisterModuleCallback" class="org.jboss.classpool.plugins.as5.RegisterModuleCallback">
+  <bean name="RegisterModuleCallback" class="org.jboss.classpool.plugins.jbosscl.RegisterModuleCallback">
      <constructor>
        <parameter><inject bean="ClassLoaderScopingPolicy"/></parameter>
      </constructor>
@@ -20,14 +20,14 @@
      </uninstall>
   </bean>
 
-  <bean name="ClassPoolFactory" class="org.jboss.classpool.plugins.as5.jbosscl.JBossClDelegatingClassPoolFactory">
+  <bean name="ClassPoolFactory" class="org.jboss.classpool.plugins.jbosscl.JBossClDelegatingClassPoolFactory">
      <constructor>
         <parameter><inject bean="ClassLoaderScopingPolicy"/></parameter>
         <parameter><inject bean="RegisterModuleCallback"/></parameter>
      </constructor>
   </bean>
 
-  <bean name="ClassPoolRepository" class="org.jboss.classpool.plugins.as5.jbosscl.JBossClDelegatingClassPoolRepository">
+  <bean name="ClassPoolRepository" class="org.jboss.classpool.plugins.jbosscl.JBossClDelegatingClassPoolRepository">
      <constructor factoryMethod="getInstance"/>
      <property name="classPoolFactory"><inject bean="ClassPoolFactory"/></property>
   </bean>

Modified: projects/jboss-deployers/trunk/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/pom.xml	2009-12-14 19:42:31 UTC (rev 97803)
+++ projects/jboss-deployers/trunk/pom.xml	2009-12-14 20:01:20 UTC (rev 97804)
@@ -341,8 +341,8 @@
         <version>${version.jboss.reflect}</version>
       </dependency>
       <dependency>
-        <groupId>org.jboss</groupId>
-        <artifactId>jboss-classpool</artifactId>
+        <groupId>org.jboss.classpool</groupId>
+        <artifactId>jboss-classpool-jbosscl</artifactId>
         <version>${version.jboss.classpool}</version>
       </dependency>
       <dependency>