[jboss-cvs] JBossAS SVN: r83599 - projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb.

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

Author: alesj
Date: 2009-01-29 01:50:52 -0500 (Thu, 29 Jan 2009)
New Revision: 83599

Modified:
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbDiscovery.java
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbResolver.java
Log:
Remove annotations - doesn't work on bean factory (cannot guarantee true dependency).

Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbDiscovery.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbDiscovery.java	2009-01-29 06:38:53 UTC (rev 83598)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbDiscovery.java	2009-01-29 06:50:52 UTC (rev 83599)
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jboss.beans.metadata.api.annotations.Inject;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.ejb3.common.deployers.spi.AttachmentNames;
 import org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver;
@@ -27,7 +26,6 @@
    private EjbReferenceResolver resolver;
    private List<EjbDescriptor<?>> ejbs = new ArrayList<EjbDescriptor<?>>();
 
-   @Inject
    public void setResolver(EjbReferenceResolver resolver)
    {
       this.resolver = resolver;

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-01-29 06:38:53 UTC (rev 83598)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbResolver.java	2009-01-29 06:50:52 UTC (rev 83599)
@@ -8,7 +8,6 @@
 import javax.inject.manager.InjectionPoint;
 import javax.persistence.PersistenceContext;
 
-import org.jboss.beans.metadata.api.annotations.Inject;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.ejb3.common.deployers.spi.AttachmentNames;
 import org.jboss.ejb3.common.resolvers.spi.EjbReference;
@@ -17,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.plugins.bootstrap.basic.KernelConstants;
 import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
@@ -50,19 +48,16 @@
       topLevelDeploymentUnit = du.getTopLevel();
    }
 
-   @Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME)
    public void setController(KernelController controller)
    {
       this.controller = controller;
    }
 
-   @Inject
    public void setResolver(EjbReferenceResolver resolver)
    {
       this.resolver = resolver;
    }
 
-   @Inject(bean = "PersistenceUnitDependencyResolver")
    public void setPersistenceUnitDependencyResolver(PersistenceUnitDependencyResolver persistenceUnitDependencyResolver)
    {
       this.persistenceUnitDependencyResolver = persistenceUnitDependencyResolver;