svn commit: r1592495 - in /tomee/tomee/trunk: maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ProvisioningWebappLoader.java

[jlmonteiro]

Author: jlmonteiro
Date: Mon May  5 12:07:45 2014
New Revision: 1592495

URL: http://svn.apache.org/r1592495
Log:
Restore the default tomcat reload behavior

Modified:
    
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ProvisioningWebappLoader.java

Modified: 
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java?rev=1592495&r1=1592494&r2=1592495&view=diff
==============================================================================
--- 
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java
 (original)
+++ 
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java
 Mon May  5 12:07:45 2014
@@ -98,8 +98,8 @@ public abstract class UpdatableTomEEMojo
         if (systemVariables == null) {
             systemVariables = new HashMap<String, String>();
         }
-        if 
(!systemVariables.containsKey("tomee.classloader.backgroundProcess")) {
-            systemVariables.put("tomee.classloader.backgroundProcess", "true");
+        if 
(!systemVariables.containsKey("tomee.classloader.skip-background-process")) {
+            systemVariables.put("tomee.classloader.skip-background-process", 
"true");
         }
     }
 

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ProvisioningWebappLoader.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ProvisioningWebappLoader.java?rev=1592495&r1=1592494&r2=1592495&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ProvisioningWebappLoader.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ProvisioningWebappLoader.java
 Mon May  5 12:07:45 2014
@@ -44,7 +44,7 @@ import java.io.File;
  * </Context>
  */
 public class ProvisioningWebappLoader extends VirtualWebappLoader {
-    public static final boolean SKIP_BACKGROUND_PROCESS = 
"true".equals(SystemInstance.get().getProperty("tomee.classloader.backgroundProcess",
 "true"));
+    public static final boolean SKIP_BACKGROUND_PROCESS = 
"true".equals(SystemInstance.get().getProperty("tomee.classloader.skip-background-process",
 "false"));
 
     @Override
     public void backgroundProcess() {
@@ -68,7 +68,10 @@ public class ProvisioningWebappLoader ex
 
     @Override
     public boolean modified() {
-        return !SKIP_BACKGROUND_PROCESS;
+        if (SKIP_BACKGROUND_PROCESS) {
+            return false;
+        }
+        return super.modified();
     }
 
     @Override