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

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

Author: alesj
Date: 2009-07-13 08:23:39 -0400 (Mon, 13 Jul 2009)
New Revision: 91156

Removed:
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/package-info.java
Modified:
   projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/MissingAsynchronousDependency.java
   projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java
Log:
Remove p-i.java, small code cleanup.

Modified: projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/MissingAsynchronousDependency.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/MissingAsynchronousDependency.java	2009-07-13 12:04:34 UTC (rev 91155)
+++ projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/MissingAsynchronousDependency.java	2009-07-13 12:23:39 UTC (rev 91156)
@@ -22,7 +22,8 @@
 package org.jboss.deployers.client.spi;
 
 /**
- * 
+ * Missing dependency info wrt asynch handling.
+ *
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision: 1.1 $
  */
@@ -53,7 +54,6 @@
    @Override
    String display()
    {
-      return String.format("Dependency \"%s\" (is currently being installed in a background thread)\n",
-            super.getDependency());
+      return String.format("Dependency \"%s\" (is currently being installed in a background thread)\n", getDependency());
    }
 }

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	2009-07-13 12:04:34 UTC (rev 91155)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java	2009-07-13 12:23:39 UTC (rev 91156)
@@ -881,10 +881,10 @@
          ControllerStateModel states)
    {
       if (context.getState().equals(ControllerState.ERROR))
+      {
          contextsInError.put(context.getName().toString(), getRootCause(context.getError()));
-      else if (isBeingInstalledAsynchronously(context))
-         return;
-      else
+      }
+      else if (isBeingInstalledAsynchronously(context) == false)
       {
          Object contextName = context.getName();
          String name = contextName.toString();
@@ -937,7 +937,7 @@
                      String requiredStateString = requiredState.getStateString();
                      MissingDependency missing = isAsynchInProgress ?
                            new MissingAsynchronousDependency(name, dependency, requiredStateString, actualStateString) :
-                              new MissingDependency(name, dependency, requiredStateString, actualStateString);
+                           new MissingDependency(name, dependency, requiredStateString, actualStateString);
                      dependencies.add(missing);
                   }
                }
@@ -1006,11 +1006,18 @@
          throw new IncompleteDeploymentException(incomplete);
    }
 
+   /**
+    * Is the controller context currently in progress.
+    *
+    * @param ctx the controller context
+    * @return true if in progress, false otherwise
+    */
    protected boolean isBeingInstalledAsynchronously(ControllerContext ctx)
    {
       if (controller instanceof AsynchronousController)
       {
-         return ((AsynchronousController)controller).isAsynchronousInstallInProgress(ctx);
+         AsynchronousController asynchronousController = AsynchronousController.class.cast(controller);
+         return asynchronousController.isAsynchronousInstallInProgress(ctx);
       }
       return false;
    }

Deleted: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/package-info.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/package-info.java	2009-07-13 12:04:34 UTC (rev 91155)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/package-info.java	2009-07-13 12:23:39 UTC (rev 91156)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
- at JBossXmlAdaptedTypes
-({
-   @JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class)
-})
-package org.jboss.deployers.vfs.plugins.dependency;
-
-import org.jboss.dependency.spi.ControllerStateValueAdapter;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.xb.annotations.JBossXmlAdaptedType;
-import org.jboss.xb.annotations.JBossXmlAdaptedTypes;
-