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/10/23 23:32:50 UTC

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

Author: rmannibucau
Date: Tue Oct 23 21:32:49 2012
New Revision: 1401495

URL: http://svn.apache.org/viewvc?rev=1401495&view=rev
Log:
TOMEE-498 removing default webapps before adding other webapps

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

Modified: openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1401495&r1=1401494&r2=1401495&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Tue Oct 23 21:32:49 2012
@@ -205,6 +205,9 @@ public abstract class AbstractTomEEMojo 
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         unzip(resolve(), catalinaBase);
+        if (removeDefaultWebapps) { // do it first to let add other war
+            removeDefaultWebapps(removeTomeeWebapp);
+        }
         copyLibs(libs, new File(catalinaBase, libDir), "jar");
         copyLibs(webapps, new File(catalinaBase, webappDir), "war"); // TODO: manage custom context ?context=foo
         copyLibs(apps, new File(catalinaBase, appDir), "jar");
@@ -223,9 +226,6 @@ public abstract class AbstractTomEEMojo 
         if (!keepServerXmlAsthis) {
             overrideAddresses();
         }
-        if (removeDefaultWebapps) {
-            removeDefaultWebapps(removeTomeeWebapp);
-        }
         if (!skipCurrentProject) {
             copyWar();
         }