Added ability to pass to ant cactus task a tmpDir for Tomcat 4.x and 5.x. Allows you

to put the cactus tomcat container anywhere you want.  Defaults to the system
directory however.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113609 13f79535-47bb-0310-9956-ffa450edef68

cactus/plugin.jelly

@@ -254,7 +254,10 @@
             todir="${cactus.reports.dir}/tomcat4x">
           <j:if test="${context.getVariable('cactus.tomcat4x.config') != null}">
             <ant:setProperty name="serverxml" value="${cactus.tomcat4x.config}"/>
-          </j:if>        
+          </j:if>    
+          <j:if test="${context.getVariable('cactus.tomcat4x.tmpdir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tomcat4x.tmpdir}"/>
+          </j:if>             
           <j:if test="${context.getVariable('cactus.tomcat4x.conf.dir') != null}">
             <conf dir="${cactus.tomcat4x.conf.dir}"
               includes="${cactus.tomcat4x.conf.includes}"
@@ -268,7 +271,10 @@
             todir="${cactus.reports.dir}/tomcat5x">
           <j:if test="${context.getVariable('cactus.tomcat5x.config') != null}">
             <ant:setProperty name="serverxml" value="${cactus.tomcat5x.config}"/>
-          </j:if>        
+          </j:if> 
+          <j:if test="${context.getVariable('cactus.tomcat5x.tmpdir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tomcat5x.tmpdir}"/>
+          </j:if>             
           <j:if test="${context.getVariable('cactus.tomcat5x.conf.dir') != null}">
             <conf dir="${cactus.tomcat5x.conf.dir}"
               includes="${cactus.tomcat5x.conf.includes}"
@@ -379,5 +385,12 @@
       prettyPrint="true"/>
 
   </goal>
+  
+  <!--==================================================================-->
+  <!-- Special no-op goal which can be used by other plugin which need  -->
+  <!-- to get access to any of this plugin's property. This is          -->
+  <!-- temporary, until we get explicit plugin dependencies.            -->
+  <!--==================================================================-->    
+  <goal name="cactus:load"/>  
 
 </project>

cactus/plugin.properties

@@ -70,6 +70,10 @@ cactus.jboss3x.config.name = default
 #cactus.tomcat4x.conf.includes = 
 #cactus.tomcat4x.conf.excludes =
 
+# (optional). Tomcat 4.x directory to which the container will be installed for the tests.
+# By default the system temporary directory is used
+#cactus.tomcat4x.tmpdir = 
+
 # (optional). Tomcat 5.x configuration file if you don't want to use the 
 # cactus-provided one
 #cactus.tomcat5x.config = 
@@ -80,3 +84,7 @@ cactus.jboss3x.config.name = default
 #cactus.tomcat5x.conf.dir = 
 #cactus.tomcat5x.conf.includes = 
 #cactus.tomcat5x.conf.excludes =
+
+# (optional). Tomcat 5.x directory to which the container will be installed for the tests.
+# By default the system temporary directory is used
+#cactus.tomcat5x.tmpdir = 

cactus/xdocs/changes.xml

@@ -8,6 +8,10 @@
   <body>
 
     <release version="3.0" date="in CVS">
+      <action dev="epugh" type="add">
+        Ability to optionally specify for Tomcat 4x and 5x a directory to which 
+        the container will be installed for the tests.        
+      </action>          
       <action dev="vmassol" type="add">
         Add all user jars that have been marked to be included in the cactus
         test (with the 

cactus/xdocs/properties.xml

@@ -239,6 +239,16 @@
             </p>
           </td>
         </tr>
+        <tr>
+	  <td>cactus.tomcat4x.tmpdir</td>
+	  <td>Yes</td>
+	  <td>
+	    <p>
+	      Directory to which the container will be installed for the tests.
+	      By default the system temporary directory is used.
+	    </p>
+	  </td>
+        </tr>
       </table>
     </section>
 
@@ -291,6 +301,16 @@
             </p>
           </td>
         </tr>
+        <tr>
+	  <td>cactus.tomcat5x.tmpdir</td>
+	  <td>Yes</td>
+	  <td>
+	    <p>
+	      Directory to which the container will be installed for the tests.
+	      By default the system temporary directory is used.
+	    </p>
+	  </td>
+        </tr>        
       </table>
     </section>