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

[rmannibucau]

Author: rmannibucau
Date: Fri Mar  2 10:40:32 2012
New Revision: 1296121

URL: http://svn.apache.org/viewvc?rev=1296121&view=rev
Log:
trying to be able to discover webmodule from 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=1296121&r1=1296120&r2=1296121&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
 Fri Mar  2 10:40:32 2012
@@ -1362,13 +1362,13 @@ public class DeploymentLoader implements
         // xbean resource finder has a bug when you use any uri but "META-INF"
         // and the jar file does not contain a directory entry for the uri
 
-        if (warFile.isFile()) {
+        if (warFile.isFile()) { // only to discover module type so xml file 
filtering is enough
             final URL jarURL = new URL("jar", "", -1, warFile.toURI().toURL() 
+ "!/");
             try {
                 final JarFile jarFile = new JarFile(warFile);
                 for (final JarEntry entry : 
Collections.list(jarFile.entries())) {
                     final String entryName = entry.getName();
-                    if (!entry.isDirectory() && 
entryName.startsWith("WEB-INF/") && entryName.indexOf('/', "WEB-INF/".length()) 
> 0) {
+                    if (!entry.isDirectory() && 
entryName.startsWith("WEB-INF/") && entryName.endsWith(".xml")) {
                         descriptors.put(entryName, new URL(jarURL, 
entry.getName()));
                     }
                 }