[jboss-cvs] JBossAS SVN: r99111 - in projects/jboss-deployers/trunk: deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers and 3 other directories.

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

Author: alesj
Date: 2010-01-07 07:46:43 -0500 (Thu, 07 Jan 2010)
New Revision: 99111

Modified:
   projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java
   projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java
   projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/AbstractDeployerTest.java
   projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestDependencyMetaData.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java
Log:
Fix ControllerState ctor usage.

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java	2010-01-07 11:54:33 UTC (rev 99110)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java	2010-01-07 12:46:43 UTC (rev 99111)
@@ -44,7 +44,7 @@
    private static final long serialVersionUID = 1L;
 
    /** The classloader state for deployments */
-   private static ControllerState CLASSLOADER_STATE = new ControllerState(DeploymentStages.CLASSLOADER.getName());
+   private static ControllerState CLASSLOADER_STATE = ControllerState.newState(DeploymentStages.CLASSLOADER.getName());
    
    /** The deployment unit */
    private DeploymentUnit unit;

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java	2010-01-07 11:54:33 UTC (rev 99110)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java	2010-01-07 12:46:43 UTC (rev 99111)
@@ -406,7 +406,7 @@
          }
       }
 
-      controller.addState(new ControllerState(stageName), preceeds);
+      controller.addState(ControllerState.newState(stageName), preceeds);
       stages.put(stageName, stage);
       log.debug("Added stage " + stageName + " before " + preceeds);
    }
@@ -753,7 +753,7 @@
       checkShutdown();
 
       context.setRequiredStage(stage);
-      ControllerState state = new ControllerState(stageName);
+      ControllerState state = ControllerState.getInstance(stageName);
       try
       {
          controller.change(deploymentControllerContext, state);

Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/AbstractDeployerTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/AbstractDeployerTest.java	2010-01-07 11:54:33 UTC (rev 99110)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/AbstractDeployerTest.java	2010-01-07 12:46:43 UTC (rev 99111)
@@ -234,7 +234,7 @@
    {
       ControllerContext context = unit.getAttachment(ControllerContext.class);
       assertNotNull("Expecting controller context attachment: " + unit, context);
-      ControllerState state = new ControllerState(stage.getName());
+      ControllerState state = ControllerState.getInstance(stage.getName());
       assertEquals(state, context.getState());
    }
 

Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestDependencyMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestDependencyMetaData.java	2010-01-07 11:54:33 UTC (rev 99110)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestDependencyMetaData.java	2010-01-07 12:46:43 UTC (rev 99111)
@@ -38,7 +38,7 @@
  */
 public class TestDependencyMetaData
 {
-   private static final ControllerState CLASSLOADER = new ControllerState(DeploymentStages.CLASSLOADER.getName());
+   private static final ControllerState CLASSLOADER = ControllerState.newState(DeploymentStages.CLASSLOADER.getName());
    
    public String name;
    
@@ -63,10 +63,10 @@
    {
       ControllerState whenState = CLASSLOADER;
       if (whenRequired != null)
-         whenState = new ControllerState(whenRequired.getName());
+         whenState = ControllerState.getInstance(whenRequired.getName());
       ControllerState depState = ControllerState.INSTALLED;
       if (dependentState != null)
-         depState = new ControllerState(dependentState.getName()); 
+         depState = ControllerState.getInstance(dependentState.getName());
       DependencyItem item = new AbstractDependencyItem(name, iDependOn, whenState, depState);
       this.iDependOn.add(item);
       return item;

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java	2010-01-07 11:54:33 UTC (rev 99110)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java	2010-01-07 12:46:43 UTC (rev 99111)
@@ -78,7 +78,7 @@
       DeploymentUnit du = addDeployment("/dependency", "bean");
       try
       {
-         assertDeployment(du, new ControllerState("PreReal"));
+         assertDeployment(du, ControllerState.getInstance("PreReal"));
          DeploymentUnit tmDU = assertDeploy("/dependency", "support");
          try
          {
@@ -123,7 +123,7 @@
       DeploymentUnit du = addDeployment("/dependency", "nested");
       try
       {
-         assertDeployment(du, new ControllerState("PreReal"));
+         assertDeployment(du, ControllerState.getInstance("PreReal"));
          DeploymentUnit tmDU = assertDeploy("/dependency", "support");
          try
          {
@@ -145,7 +145,7 @@
       DeploymentUnit du = addDeployment("/dependency", "bean");
       try
       {
-         assertDeployment(du, new ControllerState("PreReal"));
+         assertDeployment(du, ControllerState.getInstance("PreReal"));
          DeploymentUnit tmDU = assertDeploy("/dependency", "support");
          try
          {
@@ -153,7 +153,7 @@
 
             undeploy(tmDU);
 
-            assertDeployment(du, new ControllerState("PreReal"));
+            assertDeployment(du, ControllerState.getInstance("PreReal"));
 
             tmDU = assertDeploy("/dependency", "support");