svn commit: r1541611 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java

[rmannibucau]

Author: rmannibucau
Date: Wed Nov 13 17:01:50 2013
New Revision: 1541611

URL: http://svn.apache.org/r1541611
Log:
TOMEE-1073 tolerating spaces in war names

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1541611&r1=1541610&r2=1541611&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
 Wed Nov 13 17:01:50 2013
@@ -1719,23 +1719,19 @@ public class DeploymentLoader implements
 
 
         URL pathToScanDescriptors = baseUrl;
+        String path;
         if (baseUrl != null) {
-            final String baseURLString = baseUrl.toString();
-            if (baseUrl.getProtocol().equals("file") && 
baseURLString.endsWith("WEB-INF/classes/")) {
+            path = URLs.toFile(baseUrl).getAbsolutePath();
+            if (baseUrl.getProtocol().equals("file") && 
path.endsWith("WEB-INF/classes/")) {
                 //EJB found in WAR/WEB-INF/classes, scan WAR for ejb-jar.xml
-                pathToScanDescriptors = new URL(baseURLString.substring(0, 
baseURLString.lastIndexOf("WEB-INF/classes/")));
+                pathToScanDescriptors = new URL(path.substring(0, 
path.lastIndexOf("WEB-INF/classes/")));
             }
-        }
-
-        final Map<String, URL> descriptors = getDescriptors(classLoader, 
pathToScanDescriptors);
-
-        String path;
-        if (baseUrl != null) {
-            path = baseUrl.getPath();
         } else {
             path = "";
         }
 
+        final Map<String, URL> descriptors = getDescriptors(classLoader, 
pathToScanDescriptors);
+
         if (path.endsWith("/")) {
             path = path.substring(0, path.length() - 1);
         }