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

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

Author: alesj
Date: 2009-05-05 08:41:48 -0400 (Tue, 05 May 2009)
New Revision: 88211

Modified:
   projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml
   projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/DynamicDependencyCreator.java
   projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml
Log:
Go old xml way, as we plan to limit @Ann lookup.

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml	2009-05-05 11:47:11 UTC (rev 88210)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml	2009-05-05 12:41:48 UTC (rev 88211)
@@ -14,7 +14,11 @@
   <bean name="WebBeansDiscoveryDeployer" class="org.jboss.webbeans.integration.deployer.env.WebBeanDiscoveryDeployer"/>
 
   <!-- Responsible for dynamic ejb dependency creation -->
-  <bean name="DynamicDependencyCreator" class="org.jboss.webbeans.integration.deployer.env.DynamicDependencyCreator"/>
+  <bean name="DynamicDependencyCreator" class="org.jboss.webbeans.integration.deployer.env.DynamicDependencyCreator">
+    <constructor>
+      <parameter><inject bean="jboss.kernel:service=KernelController"/></parameter>
+    </constructor>
+  </bean>
 
   <!-- Responsible for booting Web Beans -->
   <bean name="WebBeansBootstrapDeployer" class="org.jboss.webbeans.integration.deployer.env.WebBeansBootstrapDeployer"/>

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/DynamicDependencyCreator.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/DynamicDependencyCreator.java	2009-05-05 11:47:11 UTC (rev 88210)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/DynamicDependencyCreator.java	2009-05-05 12:41:48 UTC (rev 88211)
@@ -21,15 +21,12 @@
  */
 package org.jboss.webbeans.integration.deployer.env;
 
-import org.jboss.beans.metadata.api.annotations.Constructor;
-import org.jboss.beans.metadata.api.annotations.Inject;
+import org.jboss.dependency.plugins.AbstractDependencyItem;
 import org.jboss.dependency.spi.Controller;
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.dependency.spi.DependencyInfo;
 import org.jboss.dependency.spi.DependencyItem;
-import org.jboss.dependency.plugins.AbstractDependencyItem;
-import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
 
 /**
  * Bean which knows how to create dynamic dependencies to target bean.
@@ -41,8 +38,7 @@
    /** The controller */
    private Controller controller;
 
-   @Constructor
-   public DynamicDependencyCreator(@Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME) Controller controller)
+   public DynamicDependencyCreator(Controller controller)
    {
       this.controller = controller;
    }

Modified: projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml	2009-05-05 11:47:11 UTC (rev 88210)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml	2009-05-05 12:41:48 UTC (rev 88211)
@@ -6,8 +6,13 @@
   <bean name="JWBMDDeployer" class="org.jboss.webbeans.integration.deployer.ext.JBossWebBeansMetaDataDeployer"/>
   <bean name="WBFilesDeployer" class="org.jboss.webbeans.integration.deployer.metadata.WebBeansFilesDeployer"/>
   <bean name="WBDiscoveryDeployer" class="org.jboss.webbeans.integration.deployer.env.WebBeanDiscoveryDeployer"/>
-  <bean name="DynamicDependencyCreator" class="org.jboss.webbeans.integration.deployer.env.DynamicDependencyCreator"/>
 
+  <bean name="DynamicDependencyCreator" class="org.jboss.webbeans.integration.deployer.env.DynamicDependencyCreator">
+    <constructor>
+      <parameter><inject bean="jboss.kernel:service=KernelController"/></parameter>
+    </constructor>
+  </bean>
+
   <bean name="BootDeployer" class="org.jboss.test.webbeans.deployers.support.MockBootDeployer"/>
 
   <!-- Mock EJB utils -->