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

[rmannibucau]

Author: rmannibucau
Date: Wed Jun 12 16:07:29 2013
New Revision: 1492261

URL: http://svn.apache.org/r1492261
Log:
TOMEE-975 accept WEB-INF/classes/META-INF/*.xml as well as just WEB-INF since 
it is a common practise and not a big issue for us

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=1492261&r1=1492260&r2=1492261&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 Jun 12 16:07:29 2013
@@ -1555,12 +1555,10 @@ public class DeploymentLoader implements
                 if (files != null) {
                     for (final File file : files) {
                         final String name = file.getName();
-                        if (RESOURCES_XML.equals(name) || 
"resources.json".equals(name)) {
-                            if (!descriptors.containsKey(name)) {
-                                descriptors.put(name, file.toURI().toURL());
-                            } else {
-                                logger.warning("Can't have a " + name + " in 
WEB-INF and WEB-INF/classes/META-INF, second will be ignored");
-                            }
+                        if (!descriptors.containsKey(name)) {
+                            descriptors.put(name, file.toURI().toURL());
+                        } else {
+                            logger.warning("Can't have a " + name + " in 
WEB-INF and WEB-INF/classes/META-INF, second will be ignored");
                         }
                     }
                 }