You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/04/12 10:59:47 UTC

svn commit: r1325161 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java

Author: rmannibucau
Date: Thu Apr 12 08:59:47 2012
New Revision: 1325161

URL: http://svn.apache.org/viewvc?rev=1325161&view=rev
Log:
making webmodule the default for tomee but not openejb

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
    openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.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=1325161&r1=1325160&r2=1325161&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 Thu Apr 12 08:59:47 2012
@@ -1554,6 +1554,11 @@ public class DeploymentLoader implements
             return PersistenceModule.class;
         }
 
+        final Class<? extends DeploymentModule> defaultType = (Class<? extends DeploymentModule>) SystemInstance.get().getOptions().get("openejb.default.deployment-module", (Class<?>) null);
+        if (defaultType != null) {
+            logger.info("type for '" + path + "' was not found, defaulting to " + defaultType.getSimpleName());
+            return defaultType;
+        }
         throw new UnknownModuleTypeException("Unknown module type: url=" + path); // baseUrl can be null
     }
 

Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1325161&r1=1325160&r2=1325161&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Thu Apr 12 08:59:47 2012
@@ -161,6 +161,9 @@ public class TomcatLoader implements Loa
             SystemInstance.get().setProperty("openejb.configuration.class", Tomee.class.getName());
         }
 
+        // tomcat default behavior is webapp, simply keep it, it is overridable by system property too
+        SystemInstance.get().setProperty("openejb.default.deployment-module", System.getProperty("openejb.default.deployment-module", "org.apache.openejb.config.WebModule"));
+
         //Those are set by TomcatHook, why re-set here???
         System.setProperty("openejb.home", SystemInstance.get().getHome().getDirectory().getAbsolutePath());
         System.setProperty("openejb.base", SystemInstance.get().getBase().getDirectory().getAbsolutePath());