[jboss-cvs] JBossAS SVN: r105873 - in projects/jboss-deployers/trunk: deployers-impl/src/test/java/org/jboss/test/deployers/classloading/support and 2 other directories.

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

Author: alesj
Date: 2010-06-09 10:43:25 -0400 (Wed, 09 Jun 2010)
New Revision: 105873

Modified:
   projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java
   projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/AbstractVFSParsingDeployer.java
   projects/jboss-deployers/trunk/pom.xml
Log:
Make proper use of shutdown policy.
TODO -- on CL snapshot.

Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java	2010-06-09 14:22:04 UTC (rev 105872)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java	2010-06-09 14:43:25 UTC (rev 105873)
@@ -46,6 +46,7 @@
  * MockDeploymentClassLoaderPolicyModule.
  * 
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
  * @version $Revision: 1.1 $
  */
 public class MockDeploymentClassLoaderPolicyModule extends AbstractDeploymentClassLoaderPolicyModule
@@ -122,6 +123,7 @@
       policy.setExcluded(metaData.getExcludedClasses());
       policy.setImportAll(isImportAll());
       policy.setDelegates(getDelegates());
+      policy.setShutdownPolicy(metaData.getShutdownPolicy());
       return policy;
    }
 

Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java	2010-06-09 14:22:04 UTC (rev 105872)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java	2010-06-09 14:43:25 UTC (rev 105873)
@@ -308,8 +308,9 @@
       assertLoadClassIllegal(clA, B.class);
 
       assertEquals(BA, deployer2.deployed);
-      assertEquals(BA, deployer2.undeployed); // we bounced
-      assertDeploymentStage(getDeploymentUnit(deployer, deploymentA.getName()), DeploymentStages.INSTALLED);
+      assertEquals(BA, deployer2.undeployed); // we got undeployed as per dynamic binding
+      assertDeploymentStage(getDeploymentUnit(deployer, deploymentA.getName()), DeploymentStages.DESCRIBE);
+      assertChange(deployer, deploymentA, DeploymentStages.INSTALLED); // move back to installed, we're dynamic so np
       clA = unitA.getClassLoader(); // re-get classloader
 
       assertLoadClassFail(clA, B.class); // no match found

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/AbstractVFSParsingDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/AbstractVFSParsingDeployer.java	2010-06-09 14:22:04 UTC (rev 105872)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/AbstractVFSParsingDeployer.java	2010-06-09 14:43:25 UTC (rev 105873)
@@ -228,7 +228,7 @@
                }
                catch (IllegalArgumentException e)
                {
-                  // most probably alt-dd file, let's take it's full path
+                  // most probably alt-dd file, let's take its full path
                   return file.getPathName();
                }
             }

Modified: projects/jboss-deployers/trunk/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/pom.xml	2010-06-09 14:22:04 UTC (rev 105872)
+++ projects/jboss-deployers/trunk/pom.xml	2010-06-09 14:43:25 UTC (rev 105873)
@@ -27,7 +27,7 @@
     <version.jboss.man>2.1.1.SP2</version.jboss.man>
     <version.jboss.mdr>2.2.0.Alpha3</version.jboss.mdr>
     <version.jboss.kernel>2.2.0.Alpha10</version.jboss.kernel>
-    <version.jboss.classloader>2.2.0.Alpha5</version.jboss.classloader>
+    <version.jboss.classloader>2.2.0-SNAPSHOT</version.jboss.classloader>
     <version.jboss.scanning>1.0.0.Alpha2</version.jboss.scanning>
     <version.jboss.classloading.spi>6.0.0-Alpha8</version.jboss.classloading.spi>
     <version.jboss.common.core>2.2.17.GA</version.jboss.common.core>