Author: djencks
Date: Fri Jul  9 01:24:46 2010
New Revision: 962385

URL: http://svn.apache.org/viewvc?rev=962385&view=rev
Log:
GERONIMO-5438 don't use the method dblevins wants to take out of openejb

Modified:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EntityManagerRegistryImpl.java
    geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerExtended.java
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/ExtendedEntityManagerRegistry.java
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EntityManagerRegistryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EntityManagerRegistryImpl.java?rev=962385&r1=962384&r2=962385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EntityManagerRegistryImpl.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EntityManagerRegistryImpl.java Fri Jul  9 01:24:46 2010
@@ -48,8 +48,8 @@ public class EntityManagerRegistryImpl i
         this.entityManagerRegistry = entityManagerRegistry;
     }
 
-    public EntityManager getEntityManager(EntityManagerFactory entityManagerFactory, Map properties) throws IllegalStateException {
-        return entityManagerRegistry.getEntityManager(entityManagerFactory, properties, true);
+    public EntityManager getEntityManager(EntityManagerFactory entityManagerFactory, Map properties, String persistenceUnitName) throws IllegalStateException {
+        return entityManagerRegistry.getEntityManager(entityManagerFactory, properties, true, persistenceUnitName);
     }
 
     public static final GBeanInfo GBEAN_INFO;

Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml?rev=962385&r1=962384&r2=962385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml Fri Jul  9 01:24:46 2010
@@ -36,9 +36,4 @@
         <artifactId>openejb-osgi-core</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.core</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=962385&r1=962384&r2=962385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Fri Jul  9 01:24:46 2010
@@ -122,6 +122,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-bundleutils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-spec-corba</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerExtended.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerExtended.java?rev=962385&r1=962384&r2=962385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerExtended.java (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerExtended.java Fri Jul  9 01:24:46 2010
@@ -18,7 +18,6 @@
 package org.apache.geronimo.persistence;
 
 import java.util.Map;
-import java.util.Set;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
@@ -39,15 +38,17 @@ public class CMPEntityManagerExtended im
     private final ExtendedEntityManagerRegistry entityManagerRegistry;
     private final EntityManagerFactory entityManagerFactory;
     private final Map entityManagerProperties;
+    private final String persistenceUnitName;
 
-    public CMPEntityManagerExtended(ExtendedEntityManagerRegistry entityManagerRegistry, EntityManagerFactory entityManagerFactory, Map entityManagerProperties) {
+    public CMPEntityManagerExtended(ExtendedEntityManagerRegistry entityManagerRegistry, EntityManagerFactory entityManagerFactory, Map entityManagerProperties, String persistenceUnitName) {
         this.entityManagerRegistry = entityManagerRegistry;
         this.entityManagerFactory = entityManagerFactory;
         this.entityManagerProperties = entityManagerProperties;
+        this.persistenceUnitName = persistenceUnitName;
     }
 
     private EntityManager getEntityManager() {
-        return entityManagerRegistry.getEntityManager(entityManagerFactory, entityManagerProperties);
+        return entityManagerRegistry.getEntityManager(entityManagerFactory, entityManagerProperties, persistenceUnitName);
     }
 
     @Override

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/ExtendedEntityManagerRegistry.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/ExtendedEntityManagerRegistry.java?rev=962385&r1=962384&r2=962385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/ExtendedEntityManagerRegistry.java (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/ExtendedEntityManagerRegistry.java Fri Jul  9 01:24:46 2010
@@ -30,6 +30,6 @@ import javax.persistence.EntityManagerFa
  */
 public interface ExtendedEntityManagerRegistry {
 
-    EntityManager getEntityManager(EntityManagerFactory entityManagerFactory, Map properties) throws IllegalStateException;
+    EntityManager getEntityManager(EntityManagerFactory entityManagerFactory, Map properties, String persistenceUnitName) throws IllegalStateException;
 
 }

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java?rev=962385&r1=962384&r2=962385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java Fri Jul  9 01:24:46 2010
@@ -157,7 +157,7 @@ public class PersistenceUnitGBean implem
         if (transactionScoped) {
             return new CMPEntityManagerTxScoped(transactionManager, getPersistenceUnitName(), entityManagerFactory, properties);
         } else if (entityManagerRegistry.getElement() != null) {
-            return new CMPEntityManagerExtended(entityManagerRegistry.getElement(), entityManagerFactory, properties);
+            return new CMPEntityManagerExtended(entityManagerRegistry.getElement(), entityManagerFactory, properties, persistenceUnitInfo.getPersistenceUnitName());
         } else {
             throw new NullPointerException("No ExtendedEntityManagerRegistry supplied, you cannot use extended persistence contexts");
         }