[jboss-cvs] JBossAS SVN: r101773 - projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/env.

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

Author: pete.muir at jboss.org
Date: 2010-03-03 09:09:02 -0500 (Wed, 03 Mar 2010)
New Revision: 101773

Modified:
   projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/env/AbstractBootstrapInfoDeployer.java
Log:
cleanup

Modified: projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/env/AbstractBootstrapInfoDeployer.java
===================================================================
--- projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/env/AbstractBootstrapInfoDeployer.java	2010-03-03 13:09:03 UTC (rev 101772)
+++ projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/env/AbstractBootstrapInfoDeployer.java	2010-03-03 14:09:02 UTC (rev 101773)
@@ -48,23 +48,34 @@
          addOutput(BootstrapInfo.class);
    }
 
+   @Override
    public final void deploy(DeploymentUnit unit, BootstrapInfo info) throws DeploymentException
    {
-      boolean doDeploy = (info != null);
-      if (doDeploy == false)
+      if (info != null)
       {
-         doDeploy = DeployersUtils.checkForWeldFiles(unit);
-         if (doDeploy)
-         {
-            // info is null, create one
-            info = new BootstrapInfo();
-            unit.addAttachment(BootstrapInfo.class, info);
-         }
+         deployInternal(unit, info);
       }
-      
-      if (doDeploy)
+      else if (info == null && DeployersUtils.checkForWeldFiles(unit))
+      {
+         info = new BootstrapInfo();
+         unit.addAttachment(BootstrapInfo.class, info);
          deployInternal(unit, info);
+      }     
    }
+   
+   @Override
+   public void undeploy(DeploymentUnit unit, BootstrapInfo info)
+   {
+      if (info != null)
+      {
+         undeployInternal(unit, info);
+      }
+   }
+   
+   protected void undeployInternal(DeploymentUnit unit, BootstrapInfo info)
+   {
+      
+   }
 
    /**
     * Do deploy.