[jboss-cvs] JBossAS SVN: r84396 - in projects/webbeans-ri-int/trunk: microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env and 1 other directory.

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

Author: alesj
Date: 2009-02-18 12:02:13 -0500 (Wed, 18 Feb 2009)
New Revision: 84396

Modified:
   projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeansBootstrapDeployer.java
   projects/webbeans-ri-int/trunk/pom.xml
Log:
Reuse existing code.

Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeansBootstrapDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeansBootstrapDeployer.java	2009-02-18 16:54:03 UTC (rev 84395)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeansBootstrapDeployer.java	2009-02-18 17:02:13 UTC (rev 84396)
@@ -26,9 +26,11 @@
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.ValueMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.dependency.spi.ControllerState;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.DeploymentStages;
 import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.spi.deployer.helpers.AttachmentLocator;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 
@@ -50,7 +52,7 @@
 
    public void deploy(DeploymentUnit unit, WebBeanDiscoveryEnvironment deployment) throws DeploymentException
    {
-      JBossWebMetaData webMetaData = findWebMetaData(unit);
+      JBossWebMetaData webMetaData = AttachmentLocator.searchChildren(unit, JBossWebMetaData.class);
       if (webMetaData == null)
          return;
 
@@ -69,11 +71,8 @@
       bootstrap.setCreate("initialize");
       bootstrap.setStart("boot");
       String webModuleName = getObjectName(webMetaData);
-/*
-      // TODO - you need MC-Kernel snapshot for this
       bootstrap.addDemand(webModuleName, ControllerState.CREATE, ControllerState.CREATE, null);
       bootstrap.addDemand(webModuleName, ControllerState.START, ControllerState.START, null);
-*/
       unit.addAttachment(bootstrapName + "_" + BeanMetaData.class.getSimpleName(), bootstrap.getBeanMetaData());
    }
 
@@ -94,43 +93,6 @@
    }
 
    /**
-    * Find web metadata.
-    *
-    * @param unit the deployment unit
-    * @return web metadata or null if not found
-    */
-   protected JBossWebMetaData findWebMetaData(DeploymentUnit unit)
-   {
-      JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class);
-      if (webMetaData != null)
-         return webMetaData;
-
-      List<DeploymentUnit> components = unit.getComponents();
-      if (components != null && components.isEmpty() == false)
-      {
-         for (DeploymentUnit component : components)
-         {
-            JBossWebMetaData result = findWebMetaData(component);
-            if (result != null)
-               return result;
-         }
-      }
-
-      List<DeploymentUnit> children = unit.getChildren();
-      if (children != null && children.isEmpty() == false)
-      {
-         for (DeploymentUnit child : children)
-         {
-            JBossWebMetaData result = findWebMetaData(child);
-            if (result != null)
-               return result;
-         }
-      }
-
-      return null;
-   }
-
-   /**
     * Get web module name.
     *
     * @param metaData the web metadata

Modified: projects/webbeans-ri-int/trunk/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/pom.xml	2009-02-18 16:54:03 UTC (rev 84395)
+++ projects/webbeans-ri-int/trunk/pom.xml	2009-02-18 17:02:13 UTC (rev 84396)
@@ -25,11 +25,11 @@
   
   <properties>
     <version.webbeans-ri>1.0.0-SNAPSHOT</version.webbeans-ri>
-    <version.jboss.vfs>2.0.0.GA</version.jboss.vfs>
+    <version.jboss.vfs>2.2.0-SNAPSHOT</version.jboss.vfs>
     <version.jboss.man>2.0.0.GA</version.jboss.man>
-    <version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer>
-    <version.jboss.cl>2.0.1.GA</version.jboss.cl>
-    <version.jboss.deployers>2.0.4.GA</version.jboss.deployers>
+    <version.jboss.microcontainer>2.2.0-SNAPSHOT</version.jboss.microcontainer>
+    <version.jboss.cl>2.0.3-SNAPSHOT</version.jboss.cl>
+    <version.jboss.deployers>2.2.0-SNAPSHOT</version.jboss.deployers>
     <version.jboss.common.core>2.2.10.GA</version.jboss.common.core>
     <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
     <version.jboss.classloading.spi>5.0.1.GA</version.jboss.classloading.spi>