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

[rmannibucau]

Author: rmannibucau
Date: Mon Jun 11 23:33:47 2012
New Revision: 1349069

URL: http://svn.apache.org/viewvc?rev=1349069&view=rev
Log:
skipping jar when default module type is 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=1349069&r1=1349068&r2=1349069&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 Jun 11 23:33:47 2012
@@ -1458,6 +1458,11 @@ public class DeploymentLoader implements
 
         final Class<? extends DeploymentModule> defaultType = (Class<? extends 
DeploymentModule>) 
SystemInstance.get().getOptions().get("openejb.default.deployment-module", 
(Class<?>) null);
         if (defaultType != null) {
+            // should we do a better filtering? it seems enough for common 
cases.
+            if (WebModule.class.equals(defaultType) && path.endsWith(".jar")) {
+                throw new UnknownModuleTypeException("Unknown module type: 
url=" + path + " which can't be a war.");
+            }
+
             logger.info("type for '" + path + "' was not found, defaulting to 
" + defaultType.getSimpleName());
             return defaultType;
         }