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

[jlaskowski]

Author: jlaskowski
Date: Sat Oct  8 18:42:08 2011
New Revision: 1180457

URL: http://svn.apache.org/viewvc?rev=1180457&view=rev
Log:
Quick fix for OPENEJB-1695 - it should rather be a configuration property or 
part of tomcat loader

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=1180457&r1=1180456&r2=1180457&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
 Sat Oct  8 18:42:08 2011
@@ -1433,6 +1433,11 @@ public class DeploymentLoader implements
             return ConnectorModule.class;
         }
 
+        // Tomcat's context.xml, possibly no web.xml as it's optional since 
Servlet 3.0
+        if (descriptors.containsKey("context.xml")) {
+            return WebModule.class;
+        }
+
         Map<String, URL> webDescriptors = getWebDescriptors(getFile(baseUrl));
         if (webDescriptors.containsKey("web.xml") || path.endsWith(".war")) {
             return WebModule.class;