You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/10/10 15:26:26 UTC
svn commit: r1180949 - in
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb:
config/ReadDescriptors.java persistence/PersistenceUnitInfoImpl.java
Author: rmannibucau
Date: Mon Oct 10 13:26:25 2011
New Revision: 1180949
URL: http://svn.apache.org/viewvc?rev=1180949&view=rev
Log:
fixing rootUrl for persistence unit
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1180949&r1=1180948&r2=1180949&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java Mon Oct 10 13:26:25 2011
@@ -122,8 +122,9 @@ public class ReadDescriptors implements
String rootUrl = moduleName;
- if (persistenceUrl.toExternalForm().contains("WEB-INF/classes/META-INF/")) {
- rootUrl = persistenceUrl.toExternalForm().replace("(WEB-INF/classes)/META-INF/.*", "$1");
+ String extForm = persistenceUrl.toExternalForm();
+ if (extForm.contains("WEB-INF/classes/META-INF/")) {
+ rootUrl = extForm.substring(0, extForm.indexOf("/META-INF"));
}
try {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java?rev=1180949&r1=1180948&r2=1180949&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java Mon Oct 10 13:26:25 2011
@@ -205,10 +205,6 @@ public class PersistenceUnitInfoImpl imp
}
public void setRootUrlAndJarUrls(String persistenceUnitRootUrl, List<String> jarFiles) throws MalformedURLException {
- if (persistenceUnitRootUrl == null) { // can be the case for hibernate
- return;
- }
-
File root;
try{
final URI rootUri = URI.create(persistenceUnitRootUrl);