svn commit: r1161962 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java

[dblevins]

Author: dblevins
Date: Fri Aug 26 01:58:33 2011
New Revision: 1161962

URL: http://svn.apache.org/viewvc?rev=1161962&view=rev
Log:
OPENEJB-1648: persistence.xml files in WEB-INF/classes/META-INF/ incorrect root 
url

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1161962&r1=1161961&r2=1161962&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
 Fri Aug 26 01:58:33 2011
@@ -114,9 +114,15 @@ public class ReadDescriptors implements 
                 }
                 String  moduleName = file.toURI().toString();
 
+                String rootUrl = moduleName;
+
+                if 
(persistenceUrl.toExternalForm().contains("WEB-INF/classes/META-INF/")) {
+                    rootUrl = 
persistenceUrl.toExternalForm().replace("(WEB-INF/classes)/META-INF/.*", "$1");
+                }
+
                 try {
                     Persistence persistence = 
JaxbPersistenceFactory.getPersistence(persistenceUrl);
-                    PersistenceModule persistenceModule = new 
PersistenceModule(moduleName, persistence);
+                    PersistenceModule persistenceModule = new 
PersistenceModule(rootUrl, persistence);
                     persistenceModule.getWatchedResources().add(moduleName);
                     if ("file".equals(persistenceUrl.getProtocol())) {
                         persistenceModule.getWatchedResources().add(path);