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

[rmannibucau]

Author: rmannibucau
Date: Mon Aug 20 07:39:45 2012
New Revision: 1374930

URL: http://svn.apache.org/viewvc?rev=1374930&view=rev
Log:
better matching of know descriptors for webapps in war

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

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1374930&r1=1374929&r2=1374930&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
 Mon Aug 20 07:39:45 2012
@@ -1319,7 +1319,7 @@ public class DeploymentLoader implements
                 for (final JarEntry entry : 
Collections.list(jarFile.entries())) {
                     final String entryName = entry.getName();
                     if (!entry.isDirectory() && 
entryName.startsWith("WEB-INF/")
-                            && (KNOWN_DESCRIPTORS.contains(entryName) || 
entryName.endsWith(".xml"))) { // + web.xml, web-fragment.xml...
+                            && 
(KNOWN_DESCRIPTORS.contains(entryName.substring("WEB-INF/".length())) || 
entryName.endsWith(".xml"))) { // + web.xml, web-fragment.xml...
                         descriptors.put(entryName, new URL(jarURL, 
entry.getName()));
                     }
                 }