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 2013/03/19 22:01:03 UTC

svn commit: r1458513 - /tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

Author: rmannibucau
Date: Tue Mar 19 21:01:03 2013
New Revision: 1458513

URL: http://svn.apache.org/r1458513
Log:
tomee maven plugin shouldn't have ever used org.apache.catalina.STRICT_SERVLET_COMPLIANCE by default - it slows down running

Modified:
    tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

Modified: tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1458513&r1=1458512&r2=1458513&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Tue Mar 19 21:01:03 2013
@@ -611,11 +611,18 @@ public abstract class AbstractTomEEMojo 
 
     protected void run() {
         final String deployOpenEjbAppKey = "openejb.system.apps";
+        final String servletCompliance = "org.apache.catalina.STRICT_SERVLET_COMPLIANCE";
+
+        boolean deactivateStrictServletCompliance = args == null || !args.contains(servletCompliance);
 
         final List<String> strings = new ArrayList<String>();
         if (systemVariables != null) {
             for (Map.Entry<String, String> entry : systemVariables.entrySet()) {
                 final String key = entry.getKey();
+                if (servletCompliance.equals(key)) {
+                    deactivateStrictServletCompliance = false;
+                }
+
                 final String value = entry.getValue();
                 if (value == null) {
                     strings.add("-D" + key);
@@ -630,6 +637,9 @@ public abstract class AbstractTomEEMojo 
                 }
             }
         }
+        if (deactivateStrictServletCompliance) {
+            strings.add("-D" + servletCompliance + "=false");
+        }
         if (quickSession) {
             strings.add("-Dopenejb.session.manager=org.apache.tomee.catalina.session.QuickSessionManager");
         }