[jboss-cvs] JBossAS SVN: r112010 - in projects/ejb3/trunk/core: src/main/java/org/jboss/ejb3 and 1 other directories.

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

Author: jaikiran
Date: 2011-08-12 04:15:27 -0400 (Fri, 12 Aug 2011)
New Revision: 112010

Modified:
   projects/ejb3/trunk/core/pom.xml
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/EJB3XPCResolver.java
Log:
Revert r110398 and r110382 in preparation for JBoss AS 6.1.0 release

Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml	2011-08-11 20:56:15 UTC (rev 112009)
+++ projects/ejb3/trunk/core/pom.xml	2011-08-12 08:15:27 UTC (rev 112010)
@@ -413,6 +413,7 @@
       <artifactId>jboss-ejb3-timerservice-naming</artifactId>
       <version>${version.org.jboss.ejb3_timerservice-naming}</version>
       <scope>test</scope>
+
     </dependency>
     
 
@@ -753,7 +754,7 @@
     <dependency>
       <groupId>org.jboss.jpa</groupId>
       <artifactId>jboss-jpa-deployers</artifactId>
-      <version>3.0.0-alpha-5</version>
+      <version>1.0.2-alpha-1</version>
       <exclusions>
         <exclusion>
           <groupId>org.jboss</groupId>

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2011-08-11 20:56:15 UTC (rev 112009)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2011-08-12 08:15:27 UTC (rev 112010)
@@ -768,7 +768,7 @@
 //         handlers.add(new EJBHandler<Environment>());
          handlers.add(new DependsHandler<Environment>());
          handlers.add(new JndiInjectHandler<Environment>());
-         //handlers.add(new PersistenceContextHandler<Environment>());
+         handlers.add(new PersistenceContextHandler<Environment>());
       }
 
       ClassLoader old = Thread.currentThread().getContextClassLoader();

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/EJB3XPCResolver.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/EJB3XPCResolver.java	2011-08-11 20:56:15 UTC (rev 112009)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/EJB3XPCResolver.java	2011-08-12 08:15:27 UTC (rev 112010)
@@ -21,15 +21,12 @@
  */
 package org.jboss.ejb3.stateful;
 
+import java.util.List;
+
 import javax.persistence.EntityManager;
 
-import org.jboss.jpa.deployment.ManagedEntityManagerFactory;
-import org.jboss.jpa.deployment.PersistenceUnitDeployment;
-import org.jboss.jpa.spi.PersistenceUnitRegistry;
 import org.jboss.jpa.spi.XPCResolver;
 
-import java.util.List;
-
 /**
  * EJB 3 Stateful beans are the only XPC aware components at the moment.
  * 
@@ -44,14 +41,11 @@
    public EntityManager getExtendedPersistenceContext(String kernelName)
    {
       StatefulBeanContext beanContext = StatefulBeanContext.currentBean.get();
-
+      
+      EntityManager em;
       if (beanContext != null)
       {
-         /**
-          * Look for XPC in current bean set.
-          */
-         EntityManager em = null;
-         List <StatefulBeanContext> beanContexts = StatefulBeanContext.currentBean.getList();
+         List<StatefulBeanContext> beanContexts = StatefulBeanContext.currentBean.getList();
          for( StatefulBeanContext bc : beanContexts)
          {
             em = bc.getExtendedPersistenceContext(kernelName);
@@ -61,39 +55,4 @@
       }
       return null;
    }
-
-   @Override
-   public EntityManager createExtendedPersistenceContext(String kernelName)
-   {
-      StatefulBeanContext beanContext = StatefulBeanContext.currentBean.get();
-
-      if (beanContext != null)
-      {
-         EntityManager em = null;
-         ManagedEntityManagerFactory factory=
-            ((PersistenceUnitDeployment) PersistenceUnitRegistry.getPersistenceUnit(kernelName)).getManagedFactory();
-         if (factory != null)
-         {
-            em = factory.createEntityManager();
-            if (em != null)
-            {
-               beanContext.addExtendedPersistenceContext(factory.getKernelName(), em);
-
-               /**
-                * TODO:  Propagate created XPC as required (7.6.2.1 Inheritance of Extended Persistence Context
-                *
-                */
-
-//               List <StatefulBeanContext> beanContexts = StatefulBeanContext.currentBean.getList();
-//               for( StatefulBeanContext bc : beanContexts)
-//               {
-//                  bc.addExtendedPersistenceContext(kernelName, em);
-//               }
-            }
-         }
-
-         return em;
-      }
-      return null;
-   }
 }