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

[rmannibucau]

Author: rmannibucau
Date: Sun Aug 21 22:33:16 2011
New Revision: 1160075

URL: http://svn.apache.org/viewvc?rev=1160075&view=rev
Log:
fixing rootUrl if it comes from a war instead of a file

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
    
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/DeploymentLoader.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1160075&r1=1160074&r2=1160075&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
 Sun Aug 21 22:33:16 2011
@@ -206,6 +206,11 @@ public class DeploymentLoader implements
                         String base = baseUrl.toString();
                         if (!base.startsWith("jar:")) {
                             base = "jar:" + base;
+                            try {
+                                baseUrl = new URL(base + "!/WEB-INF/classes");
+                            } catch (MalformedURLException e) {
+                                // ignored
+                            }
                         }
 
                         try {

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=1160075&r1=1160074&r2=1160075&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
 Sun Aug 21 22:33:16 2011
@@ -101,14 +101,20 @@ public class ReadDescriptors implements 
         List<URL> persistenceUrls = (List<URL>) 
appModule.getAltDDs().get("persistence.xml");
         if (persistenceUrls != null) {
             for (URL persistenceUrl : persistenceUrls) {
+                String moduleName = "";
+                String path;
+                if ("file".equals(persistenceUrl.getProtocol())) {
+                    File file = URLs.toFile(persistenceUrl);
+                    path = file.getAbsolutePath();
 
-                File file = URLs.toFile(persistenceUrl);
-                final String path = file.getAbsolutePath();
-
-                if (file.getName().endsWith("persistence.xml")) {
-                    file = file.getParentFile().getParentFile();
+                    if (file.getName().endsWith("persistence.xml")) {
+                        file = file.getParentFile().getParentFile();
+                    }
+                    moduleName = file.toURI().toString();
+                } else {
+                    moduleName = 
persistenceUrl.toString().replace("META-INF/persistence.xml", "");
+                    path = persistenceUrl.toString();
                 }
-                String moduleName = file.toURI().toString();
 
                 try {
                     Persistence persistence = 
JaxbPersistenceFactory.getPersistence(persistenceUrl);