Merge pull request #146 from openmrs/SDK-228

SDK-228: Always start with a clean tmp directory as a part of the Run…
openmrs · Jan 16, 2018 · a361928 · a361928
2 parents 911b148 + 66be3e4
commit a361928
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/maven-plugin/src/main/java/org/openmrs/maven/plugins/RunTomcat.java b/maven-plugin/src/main/java/org/openmrs/maven/plugins/RunTomcat.java
@@ -4,6 +4,7 @@
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.loader.WebappLoader;
 import org.apache.catalina.startup.Tomcat;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
@@ -22,6 +23,7 @@
 import org.openmrs.maven.plugins.utility.Wizard;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -115,6 +117,14 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 		}
 
 		File tempDirectory = server.getServerTmpDirectory();
+        if (tempDirectory.exists()) {
+            try {
+                FileUtils.deleteDirectory(tempDirectory);
+            }
+            catch (IOException e) {
+                throw new MojoExecutionException("Unable to delete existing tmp directory at " + tempDirectory, e);
+            }
+        }
 		tempDirectory.mkdirs();
 
 		String warFile = "openmrs.war";