svn commit: r1390373 - in /openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin: AbstractTomEEMojo.java util/Zips.java

[rmannibucau]

Author: rmannibucau
Date: Wed Sep 26 10:21:33 2012
New Revision: 1390373

URL: http://svn.apache.org/viewvc?rev=1390373&view=rev
Log:
TOMEE-430 removeTomeeWebapp option

Modified:
    
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
    
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/util/Zips.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=1390373&r1=1390372&r2=1390373&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
 Wed Sep 26 10:21:33 2012
@@ -248,6 +248,11 @@ public abstract class AbstractTomEEMojo 
     protected boolean removeDefaultWebapps;
 
     /**
+     * @parameter expression="${tomee-plugin.remove-tomee-webapps}" 
default-value="false"
+     */
+    protected boolean removeTomeeWebapp;
+
+    /**
      * @parameter expression="${project.packaging}"
      */
     protected String packaging;
@@ -279,7 +284,7 @@ public abstract class AbstractTomEEMojo 
             overrideAddresses();
         }
         if (removeDefaultWebapps) {
-            removeDefaultWebapps();
+            removeDefaultWebapps(removeTomeeWebapp);
         }
         if (!skipCurrentProject) {
             copyWar();
@@ -287,12 +292,12 @@ public abstract class AbstractTomEEMojo 
         run();
     }
 
-    private void removeDefaultWebapps() {
+    private void removeDefaultWebapps(final boolean removeTomee) {
         final File webapps = new File(catalinaBase, webappDir);
         if (webapps.isDirectory()) {
             for (File webapp : webapps.listFiles()) {
                 final String name = webapp.getName();
-                if (webapp.isDirectory() && !name.equals("openejb") && 
!name.equals("tomee")) {
+                if (webapp.isDirectory() && (removeTomee || 
!name.equals("tomee"))) {
                     try {
                         deleteDirectory(webapp);
                     } catch (IOException ignored) {

Modified: 
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/util/Zips.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/util/Zips.java?rev=1390373&r1=1390372&r2=1390373&view=diff
==============================================================================
--- 
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/util/Zips.java
 (original)
+++ 
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/util/Zips.java
 Wed Sep 26 10:21:33 2012
@@ -23,8 +23,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.jar.JarEntry;
-import java.util.jar.JarOutputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;