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

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

Author: alesj
Date: 2009-03-04 18:14:31 -0500 (Wed, 04 Mar 2009)
New Revision: 85261

Modified:
   projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/webbeans-ejb-jboss-beans.xml
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbResolver.java
Log:
Remove controller, no usage as noted by David.

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/webbeans-ejb-jboss-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/webbeans-ejb-jboss-beans.xml	2009-03-04 22:56:10 UTC (rev 85260)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/webbeans-ejb-jboss-beans.xml	2009-03-04 23:14:31 UTC (rev 85261)
@@ -8,7 +8,6 @@
   <bean name="WBJBossEjb" class="org.jboss.webbeans.integration.ejb.util.JBossEjb"/>
 
   <beanfactory name="JBossEjbResolver" class="org.jboss.webbeans.integration.ejb.JBossEjbResolver">
-     <property name="controller"><inject bean="jboss.kernel:service=KernelController" /></property>     
      <property name="resolver"><inject bean="WBJBossEjb" property="resolver"/></property>
      <property name="persistenceUnitDependencyResolver"><inject bean="PersistenceUnitDependencyResolver" /></property>
      <property name="jbossEjb"><inject bean="WBJBossEjb" /></property>

Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbResolver.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbResolver.java	2009-03-04 22:56:10 UTC (rev 85260)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbResolver.java	2009-03-04 23:14:31 UTC (rev 85261)
@@ -16,7 +16,6 @@
 import org.jboss.jpa.deployment.PersistenceUnitDeployment;
 import org.jboss.jpa.injection.InjectedEntityManagerFactory;
 import org.jboss.jpa.resolvers.PersistenceUnitDependencyResolver;
-import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.webbeans.ejb.spi.EjbResolver;
@@ -36,7 +35,6 @@
    private static final String RESOURCE_LOOKUP_PREFIX = "java:/comp/env";
    protected DeploymentUnit topLevelDeploymentUnit;
 
-   protected KernelController controller;
    protected EjbReferenceResolver resolver;
    protected PersistenceUnitDependencyResolver persistenceUnitDependencyResolver;
    protected JBossEjb jbossEjb;
@@ -49,11 +47,6 @@
       topLevelDeploymentUnit = du.getTopLevel();
    }
 
-   public void setController(KernelController controller)
-   {
-      this.controller = controller;
-   }
-
    public void setResolver(EjbReferenceResolver resolver)
    {
       this.resolver = resolver;