[jboss-cvs] JBossAS SVN: r84741 - in projects/webbeans-ri-int/trunk: microcontainer and 1 other directories.

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

Author: alesj
Date: 2009-02-25 10:38:58 -0500 (Wed, 25 Feb 2009)
New Revision: 84741

Modified:
   projects/webbeans-ri-int/trunk/microcontainer/pom.xml
   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:
Update poms.
Create BeanStore.

Modified: projects/webbeans-ri-int/trunk/microcontainer/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/pom.xml	2009-02-25 15:38:26 UTC (rev 84740)
+++ projects/webbeans-ri-int/trunk/microcontainer/pom.xml	2009-02-25 15:38:58 UTC (rev 84741)
@@ -30,6 +30,18 @@
     <!-- Global dependencies -->
 
     <dependency>
+      <groupId>org.jboss.webbeans</groupId>
+      <artifactId>webbeans-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.webbeans</groupId>
+      <artifactId>webbeans-ri-spi</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-common-core</artifactId>
       <scope>provided</scope>

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-25 15:38:26 UTC (rev 84740)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeansBootstrapDeployer.java	2009-02-25 15:38:58 UTC (rev 84741)
@@ -25,11 +25,12 @@
 import org.jboss.beans.metadata.spi.ValueMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.beans.metadata.spi.builder.ParameterMetaDataBuilder;
+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.structure.spi.DeploymentUnit;
-import org.jboss.dependency.spi.ControllerState;
+import org.jboss.webbeans.context.api.BeanStore;
 
 /**
  * Deploy WebBeans boostrap service.
@@ -61,7 +62,7 @@
       bootstrap.addPropertyMetaData("ejbDiscovery", createEjbConnector("JBossEjbDiscovery", "org.jboss.webbeans.integration.ejb.JBossEjbDiscovery", unit));
       bootstrap.addPropertyMetaData("ejbResolver", createEjbConnector("JBossEjbResolver", "org.jboss.webbeans.integration.ejb.JBossEjbResolver", unit));      
       ParameterMetaDataBuilder parameterBuilder = bootstrap.addInstallWithParameters("setApplicationContext", null, null, ControllerState.CREATE);
-      Object beanStore = null; // TODO
+      BeanStore beanStore = createBeanStore();
       parameterBuilder.addParameterMetaData("org.jboss.webbeans.context.api.BeanStore", beanStore);
       bootstrap.addInstallWithParameters("initialize", null, null, ControllerState.START);
       bootstrap.addInstall("boot");
@@ -69,6 +70,16 @@
    }
 
    /**
+    * Create new bean store.
+    *
+    * @return the bean store instance
+    */
+   protected BeanStore createBeanStore()
+   {
+      return null; // TODO
+   }
+
+   /**
     * Create ejb connector.
     *
     * @param name the connector name

Modified: projects/webbeans-ri-int/trunk/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/pom.xml	2009-02-25 15:38:26 UTC (rev 84740)
+++ projects/webbeans-ri-int/trunk/pom.xml	2009-02-25 15:38:58 UTC (rev 84741)
@@ -377,7 +377,17 @@
       	<artifactId>webbeans-ri</artifactId>
       	<version>${version.webbeans-ri}</version>
       </dependency>
-      
+      <dependency>
+      	<groupId>org.jboss.webbeans</groupId>
+      	<artifactId>webbeans-api</artifactId>
+      	<version>${version.webbeans-ri}</version>
+      </dependency>
+      <dependency>
+      	<groupId>org.jboss.webbeans</groupId>
+      	<artifactId>webbeans-ri-spi </artifactId>
+      	<version>${version.webbeans-ri}</version>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>