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

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

Author: petemuir
Date: 2009-01-08 08:03:28 -0500 (Thu, 08 Jan 2009)
New Revision: 82694

Modified:
   projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb/JBossEjbResolver.java
Log:
@PersistenceContext for wars

Modified: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb/JBossEjbResolver.java
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb/JBossEjbResolver.java	2009-01-08 11:49:51 UTC (rev 82693)
+++ projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb/JBossEjbResolver.java	2009-01-08 13:03:28 UTC (rev 82694)
@@ -5,7 +5,6 @@
 import java.lang.reflect.Method;
 
 import javax.ejb.EJB;
-import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceContextType;
 import javax.servlet.ServletContext;
@@ -21,6 +20,7 @@
 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;
 import org.jboss.webbeans.integration.jbossas.util.JBossEjb;
 import org.jboss.webbeans.integration.jbossas.vdf.KernelControllerVDFConnector;
@@ -84,7 +84,7 @@
       return naming.lookup(jndiName, Object.class);
    }
 
-   public EntityManagerFactory resolvePersistenceUnit(InjectionPoint injectionPoint, Naming naming)
+   public Object resolvePersistenceUnit(InjectionPoint injectionPoint, Naming naming)
    {
       if (injectionPoint.getAnnotation(PersistenceContext.class).type().equals(PersistenceContextType.EXTENDED))
       {
@@ -95,7 +95,7 @@
       String beanName = getPersistenceUnitSupplier(topLevelDeploymentUnit, persistenceUnitDependencyResolver, persistenceUnitName);
       PersistenceUnitDeployment deployment = JBossEjb.lookupPersistenceUnitDeployment(beanName, controller);
       ManagedEntityManagerFactory managedFactory = deployment.getManagedFactory();
-      return new InjectedEntityManagerFactory(managedFactory);
+      return new InjectedEntityManagerFactory(managedFactory).createEntityManager();
    }
 
    public Class<? extends Annotation> getEJBAnnotation()
@@ -110,7 +110,7 @@
    
    private String getPersistenceUnitSupplier(DeploymentUnit deploymentUnit, PersistenceUnitDependencyResolver persistenceUnitDependencyResolver, String persistenceUnitName)
    {
-      if (deploymentUnit.getAttachment(AttachmentNames.PROCESSED_METADATA, JBossMetaData.class) != null && deploymentUnit.getAttachment(JBossMetaData.class).isEJB3x())
+      if ((deploymentUnit.getAttachment(AttachmentNames.PROCESSED_METADATA, JBossMetaData.class) != null && deploymentUnit.getAttachment(JBossMetaData.class).isEJB3x()) || (deploymentUnit.getAttachment(JBossWebMetaData.class) != null))
       {
          try
          {