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/09/26 12:21:38 UTC
svn commit: r1390374 - in
/openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin:
AbstractTomEEMojo.java util/Zips.java
Author: rmannibucau
Date: Wed Sep 26 10:21:38 2012
New Revision: 1390374
URL: http://svn.apache.org/viewvc?rev=1390374&view=rev
Log:
TOMEE-430 removeTomeeWebapp option
Modified:
openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/util/Zips.java
Modified: openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1390374&r1=1390373&r2=1390374&view=diff
==============================================================================
--- openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Wed Sep 26 10:21:38 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/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/util/Zips.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/util/Zips.java?rev=1390374&r1=1390373&r2=1390374&view=diff
==============================================================================
--- openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/util/Zips.java (original)
+++ openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/util/Zips.java Wed Sep 26 10:21:38 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;