[jboss-cvs] JBossAS SVN: r77187 - in projects/jboss-deployers/trunk: deployers-vfs/src/main/org/jboss/deployers/vfs/plugins/classloader and 1 other directory.

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

Author: alesj
Date: 2008-08-19 07:09:39 -0400 (Tue, 19 Aug 2008)
New Revision: 77187

Modified:
   projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractOptionalRealDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/plugins/classloader/RequirementIntegrationDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/plugins/classloader/UrlIntegrationDeployer.java
Log:
[JBDEPLOY-73]; disable optional == falling back to AbstractSimpleRealDeployer.

Modified: projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractOptionalRealDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractOptionalRealDeployer.java	2008-08-19 10:57:39 UTC (rev 77186)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractOptionalRealDeployer.java	2008-08-19 11:09:39 UTC (rev 77187)
@@ -31,14 +31,17 @@
  * 
  * @param <T> the deployment type 
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @author adrian at jboss.org
- * @version $Revision: 63991 $
+ * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
  */
 public abstract class AbstractOptionalRealDeployer<T> extends AbstractRealDeployer
 {
    /** The optional input */
    private Class<T> optionalInput;
 
+   /** The disable optional flag */
+   private boolean disableOptional;
+
    /**
     * Create a new AbstractOptionalRealDeployer.
     * 
@@ -53,9 +56,22 @@
       setInputs(optionalInput);
    }
 
+   /**
+    * Should we disable optional flag.
+    * Falling back to similar behavior as AbstractSimpleRealDeployer.
+    *
+    * @param disableOptional the disable optional flag
+    */
+   public void setDisableOptional(boolean disableOptional)
+   {
+      this.disableOptional = disableOptional;
+   }
+
    public void internalDeploy(DeploymentUnit unit) throws DeploymentException
    {
-      deploy(unit, unit.getAttachment(optionalInput));
+      T deployment = unit.getAttachment(optionalInput);
+      if (disableOptional == false || deployment != null)
+         deploy(unit, deployment);
    }
 
    /**
@@ -67,11 +83,12 @@
     */
    public abstract void deploy(DeploymentUnit unit, T deployment) throws DeploymentException;
 
-
    @Override
    public void internalUndeploy(DeploymentUnit unit)
    {
-      undeploy(unit, unit.getAttachment(optionalInput));
+      T deployment = unit.getAttachment(optionalInput);
+      if (disableOptional == false || deployment != null)
+         undeploy(unit, deployment);
    }
 
    /**

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/plugins/classloader/RequirementIntegrationDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/plugins/classloader/RequirementIntegrationDeployer.java	2008-08-19 10:57:39 UTC (rev 77186)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/plugins/classloader/RequirementIntegrationDeployer.java	2008-08-19 11:09:39 UTC (rev 77187)
@@ -28,7 +28,7 @@
 import org.jboss.classloading.spi.metadata.helpers.AbstractRequirement;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
+import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 
 /**
@@ -39,7 +39,7 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  */
-public abstract class RequirementIntegrationDeployer<T> extends AbstractSimpleVFSRealDeployer<T>
+public abstract class RequirementIntegrationDeployer<T> extends AbstractOptionalVFSRealDeployer<T>
 {
    /** The jboss integration module name */
    private String integrationModuleName;

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/plugins/classloader/UrlIntegrationDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/plugins/classloader/UrlIntegrationDeployer.java	2008-08-19 10:57:39 UTC (rev 77186)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/plugins/classloader/UrlIntegrationDeployer.java	2008-08-19 11:09:39 UTC (rev 77187)
@@ -21,12 +21,12 @@
 */
 package org.jboss.deployers.vfs.plugins.classloader;
 
+import java.io.IOException;
 import java.net.URL;
-import java.io.IOException;
 
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
+import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.virtual.VFS;
 import org.jboss.virtual.VirtualFile;
@@ -39,7 +39,7 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  */
-public abstract class UrlIntegrationDeployer<T> extends AbstractSimpleVFSRealDeployer<T>
+public abstract class UrlIntegrationDeployer<T> extends AbstractOptionalVFSRealDeployer<T>
 {
    /** Location of integration jar */
    private URL integrationURL;