svn commit: r1185345 - in /tomcat/maven-plugin/trunk: tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java

[olamy]

Author: olamy
Date: Mon Oct 17 19:59:13 2011
New Revision: 1185345

URL: http://svn.apache.org/viewvc?rev=1185345&view=rev
Log:
[MTOMCAT-102]  restart without resetting extract directory was failing

Modified:
    
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
    
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java

Modified: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1185345&r1=1185344&r2=1185345&view=diff
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
 Mon Oct 17 19:59:13 2011
@@ -318,13 +318,13 @@ public abstract class AbstractExecWarMoj
                         if ( propertyWarValue != null )
                         {
                             properties.put( Tomcat7Runner.WARS_KEY,
-                                            propertyWarValue + ";" + 
artifact.getFile().getName() + "|"
+                                            propertyWarValue + ";" + 
warFileName + "|"
                                                 + warRunDependency.contextPath 
);
                         }
                         else
                         {
                             properties.put( Tomcat7Runner.WARS_KEY,
-                                            artifact.getFile().getName() + "|" 
+ warRunDependency.contextPath );
+                                            warFileName + "|" + 
warRunDependency.contextPath );
                         }
                     }
                 }

Modified: 
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java?rev=1185345&r1=1185344&r2=1185345&view=diff
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
 Mon Oct 17 19:59:13 2011
@@ -99,6 +99,16 @@ public class Tomcat7Runner
             populateWebAppWarPerContext( wars );
         }
 
+        // create tomcat various paths
+        new File( extractDirectory, "conf" ).mkdirs();
+        new File( extractDirectory, "logs" ).mkdirs();
+        new File( extractDirectory, "webapps" ).mkdirs();
+        new File( extractDirectory, "work" ).mkdirs();
+        File tmpDir = new File( extractDirectory, "temp" );
+        tmpDir.mkdirs();
+
+        System.setProperty( "java.io.tmpdir", tmpDir.getAbsolutePath() );
+
         System.setProperty( "catalina.base", 
extractDirectory.getAbsolutePath() );
         System.setProperty( "catalina.home", 
extractDirectory.getAbsolutePath() );
 
@@ -240,11 +250,9 @@ public class Tomcat7Runner
         }
         extractDirectory.mkdirs();
 
-        // create tomcat various paths
-        new File( extractDirectory, "conf" ).mkdirs();
-        new File( extractDirectory, "logs" ).mkdirs();
+
+        // ensure webapp dir is here
         new File( extractDirectory, "webapps" ).mkdirs();
-        new File( extractDirectory, "work" ).mkdirs();
 
         String wars = runtimeProperties.getProperty( WARS_KEY );
         populateWebAppWarPerContext( wars );



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org