epugh 2003/07/07 12:44:27
Modified: src/plugins-build/cactus/xdocs properties.xml changes.xml
src/plugins-build/cactus plugin.properties plugin.jelly
Log:
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.
Revision Changes Path
1.10 +20 -0 maven/src/plugins-build/cactus/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/xdocs/properties.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- properties.xml 28 May 2003 09:36:20 -0000 1.9
+++ properties.xml 7 Jul 2003 19:44:27 -0000 1.10
@@ -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>
1.12 +4 -0 maven/src/plugins-build/cactus/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/xdocs/changes.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- changes.xml 1 Jul 2003 21:04:52 -0000 1.11
+++ changes.xml 7 Jul 2003 19:44:27 -0000 1.12
@@ -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
1.11 +8 -0 maven/src/plugins-build/cactus/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/plugin.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.properties 28 May 2003 09:36:20 -0000 1.10
+++ plugin.properties 7 Jul 2003 19:44:27 -0000 1.11
@@ -70,6 +70,10 @@
#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.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 =
\ No newline at end of file
1.25 +15 -2 maven/src/plugins-build/cactus/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/plugin.jelly,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- plugin.jelly 2 Jul 2003 07:03:23 -0000 1.24
+++ plugin.jelly 7 Jul 2003 19:44:27 -0000 1.25
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
