geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r557361 - /geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
Date Wed, 18 Jul 2007 18:54:35 GMT
Author: kevan
Date: Wed Jul 18 11:54:33 2007
New Revision: 557361

URL: http://svn.apache.org/viewvc?view=rev&rev=557361
Log:
GERONIMO-3317 revert this fix. It's causing JPA deployment problems (duplicate PersistenceUnitG

Modified:
    geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java?view=diff&rev=557361&r1=557360&r2=557361
==============================================================================
--- geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
Wed Jul 18 11:54:33 2007
@@ -23,7 +23,6 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -47,7 +46,6 @@
 import org.apache.geronimo.j2ee.deployment.ModuleBuilderExtension;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
-import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.repository.Environment;
@@ -180,15 +178,6 @@
     }
 
     public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection
repository) throws DeploymentException {
-        try {
-            //make sure the PersistenceUnitGBean is started before the Module GBean
-            if (earContext.findGBeans(new AbstractNameQuery(earContext.getConfigID(), Collections.EMPTY_MAP,
PersistenceUnitGBean.class.getName())).size() > 0) {
-                GBeanData moduleGBeanData = earContext.getGBeanInstance(module.getModuleName());
-                moduleGBeanData.addDependency(new AbstractNameQuery(earContext.getConfigID(),
Collections.EMPTY_MAP, PersistenceUnitGBean.class.getName()));
-            }
-        } catch (GBeanNotFoundException e) {
-            //Module GBean not found, do nothing
-        }
     }
 
     private void buildPersistenceUnits(PersistenceDocument.Persistence persistence, Map<String,
PersistenceDocument.Persistence.PersistenceUnit> overrides, Module module, String persistenceModulePath)
throws DeploymentException {



Mime
View raw message