[jboss-cvs] JBossAS SVN: r81797 - in projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src: test/java/org/jboss/test/deployers/classloading/test and 1 other directory.

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

Author: alesj
Date: 2008-11-28 17:51:48 -0500 (Fri, 28 Nov 2008)
New Revision: 81797

Modified:
   projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java
   projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java
Log:
Port jbdeploy-138

Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java	2008-11-28 22:46:09 UTC (rev 81796)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java	2008-11-28 22:51:48 UTC (rev 81797)
@@ -409,8 +409,12 @@
          {
             try
             {
-               addDeployment(deployments[i], false);
-               DeploymentContext context = getDeploymentContext(deployments[i].getName(), true);
+               Deployment deployment = deployments[i];
+               addDeployment(deployment, false);
+               DeploymentContext context = getTopLevelDeploymentContext(deployment.getName());
+               if (contexts == null)
+                  throw new DeploymentException("Deployment context not found: " + deployment.getName());
+
                deployers.process(Collections.singletonList(context), null);
                contexts[i] = context;
             }
@@ -454,7 +458,7 @@
 
          for(Deployment deployment : deployments)
          {
-            DeploymentContext context = getDeploymentContext(deployment.getName());
+            DeploymentContext context = getTopLevelDeploymentContext(deployment.getName());
             if (context != null)
             {
                try
@@ -488,7 +492,7 @@
       List<Deployment> deployments = new ArrayList<Deployment>();
       for(String name : names)
       {
-         DeploymentContext context = getDeploymentContext(name);
+         DeploymentContext context = getTopLevelDeploymentContext(name);
          if (context != null)
             deployments.add(context.getDeployment());
          else if (log.isTraceEnabled())
@@ -696,7 +700,11 @@
 
       DeploymentContext[] contexts = new DeploymentContext[names.length];
       for(int i = 0; i < names.length; i++)
-         contexts[i] = getDeploymentContext(names[i], true);
+      {
+         contexts[i] = getTopLevelDeploymentContext(names[i]);
+         if (contexts[i] == null)
+            throw new DeploymentException("Deployment context not found: " + names[i]);
+      }
 
       return contexts;
    }

Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java	2008-11-28 22:46:09 UTC (rev 81796)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java	2008-11-28 22:51:48 UTC (rev 81797)
@@ -68,18 +68,14 @@
       Deployment ad = createSimpleDeployment("A");
       addClassLoadingMetaData(ad, ad.getName(), v1, true, A.class);
 
-      mainDeployer.addDeployment(ad);
-      mainDeployer.process();
-
+      mainDeployer.deploy(ad);
       try
       {
-         mainDeployer.checkComplete();
          assertAlias(true);
       }
       finally
       {
-         mainDeployer.removeDeployment(ad);
-         mainDeployer.process();
+         mainDeployer.undeploy(ad);
          assertAlias(false);
       }
    }