geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r793447 - /geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
Date Mon, 13 Jul 2009 02:57:04 GMT
Author: xuhaihong
Date: Mon Jul 13 02:57:03 2009
New Revision: 793447

URL: http://svn.apache.org/viewvc?rev=793447&view=rev
Log:
GERONIMO-4539 Deployment failed if JPA PU jar in web module (Patch from Shawn Jiang)

Modified:
    geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java

Modified: geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java?rev=793447&r1=793446&r2=793447&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
(original)
+++ geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
Mon Jul 13 02:57:03 2009
@@ -206,7 +206,7 @@
             abstractName = moduleContext.getNaming().createChildName(module.getModuleName(),
persistenceUnitName, PersistenceUnitGBean.GBEAN_INFO.getJ2eeType());
         } else {
             abstractName = moduleContext.getNaming().createChildName(module.getModuleName(),
persistenceModulePath, NameFactory.PERSISTENCE_UNIT_MODULE);
-            abstractName = moduleContext.getNaming().createChildName(abstractName, persistenceUnitName,
PersistenceUnitGBean.GBEAN_INFO.getJ2eeType());
+            abstractName = moduleContext.getNaming().createChildName(abstractName, moduleContext.getConfigID(),
persistenceUnitName, PersistenceUnitGBean.GBEAN_INFO.getJ2eeType());
         }
         GBeanData gbeanData = new GBeanData(abstractName, PersistenceUnitGBean.GBEAN_INFO);
         try {



Mime
View raw message