vmassol 2004/01/18 07:02:10
Modified: integration/maven plugin.properties plugin.jelly
integration/maven/xdocs changes.xml properties.xml
Log:
Added support for Resin 3.x.
Revision Changes Path
1.13 +6 -2 jakarta-cactus/integration/maven/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.properties 16 Jan 2004 22:05:00 -0000 1.12
+++ plugin.properties 18 Jan 2004 15:02:10 -0000 1.13
@@ -10,8 +10,8 @@
#
# cactus.home.tomcat4x = c:/apps/tomcat-4.1.29
#
-# Supported container names: jboss3x, tomcat4x, resin2x, orion1x,
-# orion2x, tomcat5x
+# Supported container names: jboss3x, tomcat4x, resin2x, resin3x, orion1x,
+# orion2x, tomcat5x, weblogic7x
# Location of Cactus tests in project sources
cactus.src.dir = ${basedir}/src/test-cactus
@@ -93,6 +93,10 @@
# (optional). Resin 2.x configuration file if you don't want to use the
# cactus-provided one
#cactus.resin2x.config =
+
+# (optional). Resin 3.x configuration file if you don't want to use the
+# cactus-provided one
+#cactus.resin3x.config =
# (optional). Tomcat 4.x configuration file if you don't want to use the
# cactus-provided one
1.16 +63 -0 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plugin.jelly 16 Jan 2004 22:05:00 -0000 1.15
+++ plugin.jelly 18 Jan 2004 15:02:10 -0000 1.16
@@ -108,6 +108,9 @@
<j:if test="${context.getVariable('cactus.home.resin2x') != null}">
<ant:mkdir dir="${cactus.reports.dir}/resin2x"/>
</j:if>
+ <j:if test="${context.getVariable('cactus.home.resin3x') != null}">
+ <ant:mkdir dir="${cactus.reports.dir}/resin3x"/>
+ </j:if>
<j:if test="${context.getVariable('cactus.home.tomcat4x') != null}">
<ant:mkdir dir="${cactus.reports.dir}/tomcat4x"/>
</j:if>
@@ -351,6 +354,18 @@
<ant:setProperty name="resinconf" value="${cactus.resin2x.config}"/>
</j:if>
</resin2x>
+
+ <resin3x if="cactus.home.resin3x"
+ dir="${cactus.home.resin3x}" port="${cactus.port}"
+ output="${cactus.reports.dir}/resin3x.out"
+ todir="${cactus.reports.dir}/resin3x">
+ <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+ <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+ </j:if>
+ <j:if test="${context.getVariable('cactus.resin3x.config') != null}">
+ <ant:setProperty name="resinconf" value="${cactus.resin3x.config}"/>
+ </j:if>
+ </resin3x>
<tomcat4x if="cactus.home.tomcat4x"
dir="${cactus.home.tomcat4x}" port="${cactus.port}"
@@ -449,6 +464,12 @@
</ant:fileset>
</j:if>
+ <j:if test="${context.getVariable('cactus.home.resin3x') != null}">
+ <ant:fileset dir="${cactus.reports.dir}/resin3x">
+ <ant:include name="TEST-*.xml"/>
+ </ant:fileset>
+ </j:if>
+
<j:if test="${context.getVariable('cactus.home.tomcat4x') != null}">
<ant:fileset dir="${cactus.reports.dir}/tomcat4x">
<ant:include name="TEST-*.xml"/>
@@ -562,6 +583,18 @@
<ant:setProperty name="resinconf" value="${cactus.resin2x.config}"/>
</j:if>
</resin2x>
+
+ <resin3x if="cactus.home.resin3x"
+ dir="${cactus.home.resin3x}" port="${cactus.port}"
+ output="${cactus.reports.dir}/resin3x.out"
+ todir="${cactus.reports.dir}/resin3x">
+ <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+ <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+ </j:if>
+ <j:if test="${context.getVariable('cactus.resin3x.config') != null}">
+ <ant:setProperty name="resinconf" value="${cactus.resin3x.config}"/>
+ </j:if>
+ </resin3x>
<tomcat4x if="cactus.home.tomcat4x"
dir="${cactus.home.tomcat4x}" port="${cactus.port}"
@@ -716,6 +749,18 @@
<ant:setProperty name="resinconf" value="${cactus.resin2x.config}"/>
</j:if>
</resin2x>
+
+ <resin3x if="cactus.home.resin3x"
+ dir="${cactus.home.resin3x}" port="${cactus.port}"
+ output="${cactus.reports.dir}/resin3x.out"
+ todir="${cactus.reports.dir}/resin3x">
+ <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+ <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+ </j:if>
+ <j:if test="${context.getVariable('cactus.resin3x.config') != null}">
+ <ant:setProperty name="resinconf" value="${cactus.resin3x.config}"/>
+ </j:if>
+ </resin3x>
<tomcat4x if="cactus.home.tomcat4x"
dir="${cactus.home.tomcat4x}" port="${cactus.port}"
@@ -920,6 +965,18 @@
</j:if>
</resin2x>
+ <resin3x if="cactus.home.resin3x"
+ dir="${cactus.home.resin3x}" port="${cactus.port}"
+ output="${cactus.reports.dir}/resin3x.out"
+ todir="${cactus.reports.dir}/resin3x">
+ <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+ <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+ </j:if>
+ <j:if test="${context.getVariable('cactus.resin3x.config') != null}">
+ <ant:setProperty name="resinconf" value="${cactus.resin3x.config}"/>
+ </j:if>
+ </resin3x>
+
<tomcat4x if="cactus.home.tomcat4x"
dir="${cactus.home.tomcat4x}" port="${cactus.port}"
output="${cactus.reports.dir}/tomcat4x.out"
@@ -1015,6 +1072,12 @@
<j:if test="${context.getVariable('cactus.home.resin2x') != null}">
<ant:fileset dir="${cactus.reports.dir}/resin2x">
+ <ant:include name="TEST-*.xml"/>
+ </ant:fileset>
+ </j:if>
+
+ <j:if test="${context.getVariable('cactus.home.resin3x') != null}">
+ <ant:fileset dir="${cactus.reports.dir}/resin3x">
<ant:include name="TEST-*.xml"/>
</ant:fileset>
</j:if>
1.17 +3 -0 jakarta-cactus/integration/maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/changes.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- changes.xml 16 Jan 2004 22:05:00 -0000 1.16
+++ changes.xml 18 Jan 2004 15:02:10 -0000 1.17
@@ -8,6 +8,9 @@
<body>
<release version="1.6dev" date="in CVS">
+ <action dev="vmassol" type="add">
+ Added support for Resin 3.x (above version 3.0.5).
+ </action>
</release>
<release version="1.6dev" date="development build of 2004-01-15">
1.16 +23 -2 jakarta-cactus/integration/maven/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/properties.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- properties.xml 16 Jan 2004 22:05:00 -0000 1.15
+++ properties.xml 18 Jan 2004 15:02:10 -0000 1.16
@@ -21,8 +21,9 @@
Home directory of where you have installed the container on
which you wish to run the Cactus tests. Valid container
names are: <code>tomcat4x</code>, <code>tomcat5x</code>,
- <code>resin2x</code>, <code>orion1x</code>,
- <code>orion2x</code> and <code>jboss3x</code>.
+ <code>resin2x</code>, <code>resin3x</code>,
+ <code>orion1x</code>, <code>orion2x</code>, <code>jboss3x</code>
+ and <code>weblogic7x</code>.
</p>
</td>
</tr>
@@ -277,6 +278,26 @@
<td>
<p>
Location of the Resin 2.x configuration file if you don't want
+ to use the cactus-provided one.
+ </p>
+ </td>
+ </tr>
+ </table>
+ </section>
+
+ <section name="Cactus/Resin 3.x Settings">
+ <table>
+ <tr>
+ <th>Property</th>
+ <th>Optional?</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>cactus.resin3x.config</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Location of the Resin 3.x configuration file if you don't want
to use the cactus-provided one.
</p>
</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
