svn commit: r1591547 - 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

[rmannibucau]

Author: rmannibucau
Date: Thu May  1 05:31:59 2014
New Revision: 1591547

URL: http://svn.apache.org/r1591547
Log:
s/\t/    /

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=1591547&r1=1591546&r2=1591547&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
 Thu May  1 05:31:59 2014
@@ -70,7 +70,7 @@ public abstract class UpdatableTomEEMojo
     protected void run() {
         if (synchronization != null) {
             initSynchronization(synchronization);
-                       avoidAutoReload();
+            avoidAutoReload();
         }
         if (synchronizations != null) {
             for (final Synch s : synchronizations) {
@@ -79,7 +79,7 @@ public abstract class UpdatableTomEEMojo
                     continue;
                 }
                 initSynch(s);
-                               avoidAutoReload();
+                avoidAutoReload();
             }
         }
 
@@ -94,16 +94,16 @@ public abstract class UpdatableTomEEMojo
         super.run();
     }
 
-       private void avoidAutoReload() {
-               if (systemVariables == null) {
-                       systemVariables = new HashMap<String, String>();
-               }
-               if 
(!systemVariables.containsKey("tomee.classloader.backgroundProcess")) {
-                       
systemVariables.put("tomee.classloader.backgroundProcess", "true");
-               }
-       }
+    private void avoidAutoReload() {
+        if (systemVariables == null) {
+            systemVariables = new HashMap<String, String>();
+        }
+        if 
(!systemVariables.containsKey("tomee.classloader.backgroundProcess")) {
+            systemVariables.put("tomee.classloader.backgroundProcess", "true");
+        }
+    }
 
-       private void initSynch(final AbstractSynchronizable s) {
+    private void initSynch(final AbstractSynchronizable s) {
         s.getExtensions().addAll(s.getUpdateOnlyExtenions());
         if (reloadOnUpdate) {
             deployOpenEjbApplication = true;
@@ -226,7 +226,7 @@ public abstract class UpdatableTomEEMojo
             deployer().reload(path);
         } else {
             getLog().warn("Reload command needs to activate openejb internal 
application. " +
-              "Add <deployOpenEjbApplication>true</deployOpenEjbApplication> 
to the plugin configuration to force it.");
+                    "Add 
<deployOpenEjbApplication>true</deployOpenEjbApplication> to the plugin 
configuration to force it.");
         }
     }
 

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=1591547&r1=1591546&r2=1591547&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
 Thu May  1 05:31:59 2014
@@ -32,27 +32,25 @@ import java.io.File;
 
 /**
  * Usage example in META-INF/context.xml
- *
-
- <Context antiJARLocking="true" >
-     <Loader
-         className="org.apache.tomee.catalina.ProvisioningWebappLoader"
-         searchExternalFirst="true"
-         
virtualClasspath="mvn:commons-el:commons-el:1.0;mvn:commons-el:commons-el:1.0"
-         searchVirtualFirst="true"
-     />
- </Context>
-
- *
+ * <p/>
+ * <p/>
+ * <Context antiJARLocking="true" >
+ * <Loader
+ * className="org.apache.tomee.catalina.ProvisioningWebappLoader"
+ * searchExternalFirst="true"
+ * 
virtualClasspath="mvn:commons-el:commons-el:1.0;mvn:commons-el:commons-el:1.0"
+ * searchVirtualFirst="true"
+ * />
+ * </Context>
  */
 public class ProvisioningWebappLoader extends VirtualWebappLoader {
-       private 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.backgroundProcess",
 "true"));
 
     @Override
     public void backgroundProcess() {
-               if (SKIP_BACKGROUND_PROCESS) {
-                       return;
-               }
+        if (SKIP_BACKGROUND_PROCESS) {
+            return;
+        }
 
         final ClassLoader classloader = super.getClassLoader();
         if (classloader instanceof LazyStopWebappClassLoader) {
@@ -68,12 +66,12 @@ public class ProvisioningWebappLoader ex
         }
     }
 
-       @Override
-       public boolean modified() {
-               return !SKIP_BACKGROUND_PROCESS;
-       }
+    @Override
+    public boolean modified() {
+        return !SKIP_BACKGROUND_PROCESS;
+    }
 
-       @Override
+    @Override
     protected void startInternal() throws LifecycleException {
         // standard tomcat part
         final StringBuilder builder = new StringBuilder();