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/01/10 21:33:33 UTC
svn commit: r1229711 -
/openejb/trunk/maven-plugins/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
Author: rmannibucau
Date: Tue Jan 10 20:33:33 2012
New Revision: 1229711
URL: http://svn.apache.org/viewvc?rev=1229711&view=rev
Log:
ensuring to override the webapp
Modified:
openejb/trunk/maven-plugins/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
Modified: openejb/trunk/maven-plugins/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/maven-plugins/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1229711&r1=1229710&r2=1229711&view=diff
==============================================================================
--- openejb/trunk/maven-plugins/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ openejb/trunk/maven-plugins/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Tue Jan 10 20:33:33 2012
@@ -188,8 +188,10 @@ public abstract class AbstractTomEEMojo
}
private void copyWar() {
+ final File out = new File(catalinaBase, webappDir + "/" + warFile.getName());
+
try {
- FileUtils.deleteDirectory(warFile);
+ FileUtils.deleteDirectory(out);
} catch (IOException e) {
throw new TomEEException(e.getMessage(), e);
}
@@ -198,7 +200,7 @@ public abstract class AbstractTomEEMojo
OutputStream os = null;
try {
is = new FileInputStream(warFile);
- os = new FileOutputStream(new File(catalinaBase, webappDir + "/" + warFile.getName()));
+ os = new FileOutputStream(out);
copy(is, os);
} catch (Exception e) {
throw new TomEEException(e.getMessage(), e);