geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1034292 - /geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
Date Fri, 12 Nov 2010 08:19:22 GMT
Author: xuhaihong
Date: Fri Nov 12 08:19:21 2010
New Revision: 1034292

URL: http://svn.apache.org/viewvc?rev=1034292&view=rev
Log:
Did not copy the changes correctly from the 2.1 branch ...

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

Modified: geronimo/server/branches/2.2/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.2/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java?rev=1034292&r1=1034291&r2=1034292&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
(original)
+++ geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
Fri Nov 12 08:19:21 2010
@@ -109,7 +109,7 @@ public class PersistenceUnitBuilder impl
             File rootBaseFile;
             URI moduleBaseURI;
             if (module.getRootEarContext().getInPlaceConfigurationDir() == null) {
-                rootBaseFile = module.getRootEarContext().getConfigurationDir();
+                rootBaseFile = module.getRootEarContext().getConfiguration().getConfigurationDir();
                 moduleBaseURI = moduleContext.getBaseDir().toURI();
             } else {
                 rootBaseFile = module.getRootEarContext().getInPlaceConfigurationDir();



Mime
View raw message