You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/10/29 09:02:28 UTC
svn commit: r1028631 -
/geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
Author: genspring
Date: Fri Oct 29 07:02:28 2010
New Revision: 1028631
URL: http://svn.apache.org/viewvc?rev=1028631&view=rev
Log:
GERONIMO-5452 PersistenceUnitBuilder cannot find persistence.xml on inPlace deployments, patch from Ryan Sumner
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=1028631&r1=1028630&r2=1028631&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 Fri Oct 29 07:02:28 2010
@@ -105,9 +105,18 @@ public class PersistenceUnitBuilder impl
// buildPersistenceUnits(persistence, module, module.getTargetPath());
}
try {
- File rootBaseFile = module.getRootEarContext().getConfiguration().getConfigurationDir();
+
+ File rootBaseFile;
+ URI moduleBaseURI;
+ if (module.getRootEarContext().getConfigurationData().getInPlaceConfigurationDir() == null) {
+ rootBaseFile = module.getRootEarContext().getConfigurationData().getConfigurationDir();
+ moduleBaseURI = moduleContext.getBaseDir().toURI();
+ } else {
+ rootBaseFile = module.getRootEarContext().getConfigurationData().getInPlaceConfigurationDir();
+ moduleBaseURI = moduleContext.getConfigurationData().getInPlaceConfigurationDir().toURI();
+ }
String rootBase = rootBaseFile.toURI().normalize().toString();
- URI moduleBaseURI = moduleContext.getBaseDir().toURI();
+
Map rootGeneralData = module.getRootEarContext().getGeneralData();
ClassPathList manifestcp = (ClassPathList) module.getEarContext().getGeneralData().get(ClassPathList.class);
if (manifestcp == null) {