vmassol 2002/11/10 08:10:35
Modified: src/plugins-build/cactus plugin.jelly plugin.properties
src/plugins-build/cactus/scripts resin.2x.jelly
tomcat.4x.jelly weblogic.7x.jelly
src/plugins-build/cactus/xdocs changes.xml index.xml
navigation.xml tasks.xml
Added: src/plugins-build/cactus/xdocs using.xml
Log:
* Improved documentation
* War creation is now left to the war plugin. Thus to run a cactus test, you need to
type: maven war cactus:test-tomcat-4x (for example)
* Added support for war:webapp. Type: maven war:webapp cactus:test-tomcat-4x (for
example)
Revision Changes Path
1.11 +85 -66 jakarta-turbine-maven/src/plugins-build/cactus/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/cactus/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 7 Nov 2002 13:48:08 -0000 1.10
+++ plugin.jelly 10 Nov 2002 16:10:34 -0000 1.11
@@ -7,7 +7,7 @@
-->
<project xmlns:j="jelly:core" xmlns:dvsl="dvsl">
- <!-- Import all the jelly scripts found in the maven.cactus.conf.dir
+ <!-- Import all the jelly scripts found in the maven.cactus.conf.dir
directory. They are jelly scripts to start/stop the different
containers. -->
<fileScanner var="scanner">
@@ -28,7 +28,7 @@
<mkdir dir="${maven.cactus.build.dir}"/>
<mkdir dir="${maven.cactus.classes.dir}"/>
- <javac
+ <javac
destdir="${maven.cactus.classes.dir}"
excludes="**/package.html"
debug="${maven.compile.debug}"
@@ -49,65 +49,84 @@
<!--
========================================================================
- Generate a Cactus WAR file.
-
- Call the War goal from the War plugin and then update the war to
- add Cactus specific stuff: modified web.xml, Cactus related jars
- and Cactus tests.
-
+ Create the Cactus webapp (i.e. add Cactus related jars/config/test
+ classes to either the project war or the project webapp).
+ ========================================================================
+ -->
+ <goal name="cactus:webapp">
+
+ <available file="${maven.cactus.prewar.dir}/${pom.id}.war"
+ property="maven.cactus.prewar.exists"/>
+
+ <j:choose>
+
+ <j:when test="${maven.cactus.prewar.exists}">
+
+ <!-- Expand the project war -->
+ <unwar src="${maven.cactus.prewar.dir}/${pom.id}.war"
+ dest="${maven.cactus.build.dir}/${pom.id}"/>
+ <attainGoal name="cactus:webapp-update"/>
+
+ </j:when>
+
+ <j:otherwise>
+
+ <available file="${maven.cactus.prewar.dir}/${pom.id}/WEB-INF"
+ type="dir" property="maven.cactus.prewebapp.exists"/>
+
+ <j:choose>
+ <j:when test="${maven.cactus.prewebapp.exists}">
+
+ <copy todir="${maven.cactus.build.dir}/${pom.id}">
+ <fileset dir="${maven.cactus.prewar.dir}/${pom.id}"/>
+ </copy>
+ <attainGoal name="cactus:webapp-update"/>
+
+ </j:when>
+ <j:otherwise>
+ <echo>Either a war or a webapp must exist. Please call the War plugin
first.</echo>
+ </j:otherwise>
+ </j:choose>
+
+ </j:otherwise>
+ </j:choose>
+
+ </goal>
+
+ <!--
+ ========================================================================
+ Generate an expanded Cactus webapp from a project expanded webapp.
+
Note: ${maven.cactus.webxml} need to be set and point to a valid
web.xml prior to calling this goal.
========================================================================
-->
- <goal name="cactus:war" prereqs="war:war,cactus:compile">
+ <goal name="cactus:webapp-update" prereqs="cactus:compile">
- <copy tofile="${maven.cactus.build.dir}/jspRedirector.jsp"
+ <!-- Copy Cactus configuration files -->
+ <copy todir="${maven.cactus.build.dir}/${pom.id}"
file="${maven.cactus.jspRedirector}"/>
-
- <war update="true" webxml="${maven.cactus.webxml}"
- warfile="${maven.war.build.dir}/${pom.id}.war">
-
- <!-- Cactus framework -->
- <lib
dir="${maven.repo.local}/${plugin.getDependency('cactus:cactus').getProjectId()}/jars/">
- <include name="${plugin.getDependency('cactus:cactus').getArtifact()}"/>
- </lib>
-
- <!-- AspectJ runtime -->
- <lib
dir="${maven.repo.local}/${plugin.getDependency('aspectj:aspectjrt').getProjectId()}/jars/">
- <include name="${plugin.getDependency('aspectj:aspectjrt').getArtifact()}"/>
- </lib>
-
- <!-- Commons Logging -->
- <lib
dir="${maven.repo.local}/${plugin.getDependency('commons-logging').getProjectId()}/jars/">
- <include name="${plugin.getDependency('commons-logging').getArtifact()}"/>
- </lib>
-
- <!-- JUnit -->
- <lib
dir="${maven.repo.local}/${plugin.getDependency('junit').getProjectId()}/jars/">
- <include name="${plugin.getDependency('junit').getArtifact()}"/>
- </lib>
-
- <!-- Add project dependencies jars -->
- <j:forEach var="lib" items="${pom.dependencies}">
- <j:if test="${lib.getProperty('war.bundle.jar')=='true'}">
- <lib dir="${maven.repo.local}/${lib.getProjectId()}/jars/">
- <include name="${lib.getArtifact()}"/>
- </lib>
- </j:if>
- </j:forEach>
-
- <!-- Add the Cactus Jsp Redirector -->
- <fileset dir="${maven.cactus.build.dir}">
- <include name="jspRedirector.jsp"/>
- </fileset>
- <!-- Add Cactus tests -->
- <classes dir="${maven.cactus.classes.dir}"/>
-
- </war>
+ <copy todir="${maven.cactus.build.dir}/${pom.id}/WEB-INF"
+ file="${maven.cactus.webxml}"/>
+
+ <!-- Copy Cactus jars -->
+ <copy todir="${maven.cactus.build.dir}/${pom.id}/WEB-INF/lib"
+ file="${plugin.getDependencyPath('cactus:cactus')}"/>
+ <copy todir="${maven.cactus.build.dir}/${pom.id}/WEB-INF/lib"
+ file="${plugin.getDependencyPath('aspectj:aspectjrt')}"/>
+ <copy todir="${maven.cactus.build.dir}/${pom.id}/WEB-INF/lib"
+ file="${plugin.getDependencyPath('commons-logging')}"/>
+ <copy todir="${maven.cactus.build.dir}/${pom.id}/WEB-INF/lib"
+ file="${plugin.getDependencyPath('junit')}"/>
+
+ <!-- Copy Cactus tests -->
+ <copy todir="${maven.cactus.build.dir}/${pom.id}/WEB-INF/classes">
+ <fileset dir="${maven.cactus.classes.dir}"/>
+ </copy>
</goal>
-
+
<!--
========================================================================
Start the Cactus tests using the <junit> Ant task.
@@ -143,7 +162,7 @@
<pathelement path="${plugin.getDependencyPath('commons-httpclient')}"/>
<pathelement path="${plugin.getDependencyPath('commons-logging')}"/>
<pathelement path="${plugin.getDependencyPath('aspectj:aspectjrt')}"/>
- <!-- These 2 jars should not be needed but it won't work without
+ <!-- These 2 jars should not be needed but it won't work without
them -->
<pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
<pathelement path="${plugin.getDependencyPath('xerces')}"/>
@@ -189,21 +208,21 @@
in="${maven.cactus.test.reportsDirectory}/TESTS-TestSuites.xml"
out="${maven.gen.docs}/cactus-report.xml">
</dvsl:dvsl>
-
+
</goal>
-
+
<!--
========================================================================
- Execute a single Cactus test case defined using the 'testcase'
+ Execute a single Cactus test case defined using the 'testcase'
variable.
-
+
NOTE: This assumes that the server was already started and that the
Cactus war has already been deployed.
========================================================================
-->
<goal name="cactus:single" prereqs="war:war,cactus:compile"
description="Execute a single test defined using the 'testcase' variable">
-
+
<j:choose>
<j:when test="${empty(testcase)}">
<echo>
@@ -211,14 +230,14 @@
Example: maven -Dtestcase=MyTest cactus:single
</echo>
</j:when>
-
+
<j:otherwise>
<taskdef name="junit"
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
-
+
<junit printSummary="yes" fork="true" dir="${basedir}"
failureProperty="maven.cactus.test.failure">
-
+
<formatter type="xml"/>
<formatter type="plain" usefile="${maven.cactus.junit.usefile}"/>
<classpath>
@@ -231,22 +250,22 @@
<pathelement
path="${plugin.getDependencyPath('commons-httpclient')}"/>
<pathelement path="${plugin.getDependencyPath('commons-logging')}"/>
<pathelement path="${plugin.getDependencyPath('aspectj:aspectjrt')}"/>
- <!-- These 2 jars should not be needed but it won't work without
+ <!-- These 2 jars should not be needed but it won't work without
them -->
<pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
<pathelement path="${plugin.getDependencyPath('xerces')}"/>
</classpath>
<test name="${testcase}" todir="${maven.cactus.test.reportsDirectory}"/>
-
+
</junit>
-
+
<j:if test="${maven.cactus.test.failure}">
<j:set var="cactusignore__"
value="${maven.cactus.test.failure.ignore}X"/>
<j:if test="${cactusignore__ == 'X'}">
<fail message="There were test failures."/>
</j:if>
- </j:if>
-
+ </j:if>
+
</j:otherwise>
</j:choose>
</goal>
1.5 +4 -0 jakarta-turbine-maven/src/plugins-build/cactus/plugin.properties
Index: plugin.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/plugins-build/cactus/plugin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.properties 7 Nov 2002 13:42:27 -0000 1.4
+++ plugin.properties 10 Nov 2002 16:10:34 -0000 1.5
@@ -52,3 +52,7 @@
# Location of generated raw test reports
maven.cactus.test.reportsDirectory = ${maven.cactus.build.dir}/test-reports
+
+# Location where the project war/webapp is located (either as a war or an
+# expanded webapp). Cactus will then add its own stuff to the war/webapp.
+maven.cactus.prewar.dir = ${maven.war.build.dir}
1.3 +61 -18
jakarta-turbine-maven/src/plugins-build/cactus/scripts/resin.2x.jelly
Index: resin.2x.jelly
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/plugins-build/cactus/scripts/resin.2x.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- resin.2x.jelly 7 Nov 2002 10:05:37 -0000 1.2
+++ resin.2x.jelly 10 Nov 2002 16:10:34 -0000 1.3
@@ -38,28 +38,72 @@
Run the tests
========================================================================
-->
- <goal name="cactus:resin-2x-run" prereqs="cactus:resin-2x-setup">
+ <goal name="cactus:resin-2x-run" prereqs="cactus:setup-resin-2x">
<!-- Start the servlet engine, wait for it to be started, run the
unit tests, stop the servlet engine, wait for it to be stopped.
The servlet engine is stopped if the tests fail for any reason -->
- <j:thread>
- <attainGoal name="cactus:resin-2x-start"/>
- </j:thread>
+ <!-- Is Resin 2.x already started? -->
+ <condition property="resin2xstarted">
+ <socket server="localhost" port="${maven.cactus.port}"/>
+ </condition>
+
+ <j:choose>
+ <j:when test="${resin2xstarted == null}">
+ <j:thread>
+ <attainGoal name="cactus:start-resin-2x"/>
+ </j:thread>
+ </j:when>
+ <j:otherwise>
+ <attainGoal name="cactus:redeploy-resin-2x"/>
+ </j:otherwise>
+ </j:choose>
<waitfor checkevery="500">
<http
url="http://localhost:${maven.cactus.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"/>
</waitfor>
- <attainGoal name="cactus:test"/>
- <attainGoal name="cactus:resin-2x-stop"/>
+ <attainGoal name="cactus:test"/>
- <waitfor checkevery="500">
- <not>
- <http
url="http://localhost:${maven.cactus.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"/>
- </not>
- </waitfor>
+ <!-- Only stop if the container was not already started -->
+ <j:if test="${resin2xstarted == null}">
+ <attainGoal name="cactus:stop-resin-2x"/>
+ <waitfor checkevery="500">
+ <not>
+ <http
url="http://localhost:${maven.cactus.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"/>
+ </not>
+ </waitfor>
+ </j:if>
+
+ </goal>
+
+ <!--
+ ========================================================================
+ Deploy the test webapp in Resin
+ ========================================================================
+ -->
+ <goal name="cactus:deploy-resin-2x" prereqs="cactus:webapp">
+
+ <copy todir="${maven.cactus.build.dir}/resin2x/test">
+ <fileset dir="${maven.cactus.build.dir}/${pom.id}"/>
+ </copy>
+
+ </goal>
+
+ <!--
+ ========================================================================
+ Redeploy the test webapp in Resin by only deploying the files in
+ WEB-INF/classes (it is faster)
+ ========================================================================
+ -->
+ <goal name="cactus:redeploy-resin-2x" prereqs="cactus:webapp">
+
+ <copy todir="${maven.cactus.build.dir}/resin2x/test">
+ <fileset dir="${maven.cactus.build.dir}/${pom.id}">
+ <include name="WEB-INF/classes/**"/>
+ </fileset>
+ </copy>
</goal>
@@ -68,7 +112,7 @@
Prepare directories and variables for running the tests
========================================================================
-->
- <goal name="cactus:resin-2x-setup" prereqs="cactus:war">
+ <goal name="cactus:setup-resin-2x">
<mkdir dir="${maven.cactus.build.dir}/resin2x"/>
@@ -79,10 +123,6 @@
</filterset>
</copy>
- <!-- Copy the war file -->
- <copy file="${maven.war.build.dir}/${pom.id}.war"
- tofile="${maven.cactus.build.dir}/resin2x/test.war"/>
-
</goal>
<!--
@@ -90,7 +130,9 @@
Start Resin 2.x
========================================================================
-->
- <goal name="cactus:resin-2x-start">
+ <goal name="cactus:start-resin-2x"
+ prereqs="cactus:setup-resin-2x,cactus:deploy-resin-2x"
+ description="Starts Resin 2.x">
<java classname="org.apache.cactus.ant.ResinRun" fork="yes">
@@ -118,7 +160,8 @@
Stop Resin 2.x
========================================================================
-->
- <goal name="cactus:resin-2x-stop">
+ <goal name="cactus:stop-resin-2x"
+ description="Stops a running Resin 2.x">
<java classname="org.apache.cactus.ant.ResinRun" fork="yes">
1.5 +9 -14
jakarta-turbine-maven/src/plugins-build/cactus/scripts/tomcat.4x.jelly
Index: tomcat.4x.jelly
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/plugins-build/cactus/scripts/tomcat.4x.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tomcat.4x.jelly 7 Nov 2002 10:05:37 -0000 1.4
+++ tomcat.4x.jelly 10 Nov 2002 16:10:34 -0000 1.5
@@ -83,13 +83,11 @@
Deploy the test webapp in Tomcat
========================================================================
-->
- <goal name="cactus:deploy-tomcat-4x" prereqs="cactus:war">
+ <goal name="cactus:deploy-tomcat-4x" prereqs="cactus:webapp">
- <!-- Unwar our war so that Tomcat can dynamically pick up changes without
- having to stop/restart it -->
- <unwar src="${maven.war.build.dir}/${pom.id}.war"
- dest="${maven.cactus.build.dir}/tomcat4x/webapps/test">
- </unwar>
+ <copy todir="${maven.cactus.build.dir}/tomcat4x/webapps/test">
+ <fileset dir="${maven.cactus.build.dir}/${pom.id}"/>
+ </copy>
</goal>
@@ -99,16 +97,13 @@
WEB-INF/classes (it is faster)
========================================================================
-->
- <goal name="cactus:redeploy-tomcat-4x" prereqs="cactus:war">
+ <goal name="cactus:redeploy-tomcat-4x" prereqs="cactus:webapp">
- <!-- Unwar our war so that Tomcat can dynamically pick up changes without
- having to stop/restart it -->
- <unwar src="${maven.war.build.dir}/${pom.id}.war"
- dest="${maven.cactus.build.dir}/tomcat4x/webapps/test">
- <patternset>
+ <copy todir="${maven.cactus.build.dir}/tomcat4x/webapps/test">
+ <fileset dir="${maven.cactus.build.dir}/${pom.id}">
<include name="WEB-INF/classes/**"/>
- </patternset>
- </unwar>
+ </fileset>
+ </copy>
<!-- Ideally we would need to wait until Tomcat has finished reloading
the changes. But apart from using the new Manager in Tomcat 4.1.x
1.2 +14 -15
jakarta-turbine-maven/src/plugins-build/cactus/scripts/weblogic.7x.jelly
Index: weblogic.7x.jelly
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/plugins-build/cactus/scripts/weblogic.7x.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- weblogic.7x.jelly 7 Nov 2002 13:42:28 -0000 1.1
+++ weblogic.7x.jelly 10 Nov 2002 16:10:34 -0000 1.2
@@ -83,16 +83,16 @@
Deploy the test webapp in WebLogic
========================================================================
-->
- <goal name="cactus:deploy-weblogic-7x" prereqs="cactus:war">
+ <goal name="cactus:deploy-weblogic-7x" prereqs="cactus:webapp">
- <unwar src="${maven.war.build.dir}/${pom.id}.war"
- dest="${maven.cactus.build.dir}/weblogic7x/testdomain/applications/test">
- </unwar>
-
- <!-- Update the war to include the proprietary weblogic.xml config
- file. -->
- <copy
todir="${maven.cactus.build.dir}/weblogic7x/testdomain/applications/test/WEB-INF"
- file="${maven.cactus.conf.containers.dir}/weblogic7x/weblogic.xml"/>
+ <copy todir="${maven.cactus.build.dir}/weblogic7x/testdomain/applications/test">
+ <fileset dir="${maven.cactus.build.dir}/${pom.id}"/>
+ <!-- Update the war to include the proprietary weblogic.xml config
+ file. -->
+ <fileset dir="${maven.cactus.conf.containers.dir}/weblogic7x">
+ <include name="weblogic.xml"/>
+ </fileset>
+ </copy>
</goal>
@@ -101,14 +101,13 @@
Redeploy the test webapp in WebLogic
========================================================================
-->
- <goal name="cactus:redeploy-weblogic-7x" prereqs="cactus:war">
+ <goal name="cactus:redeploy-weblogic-7x" prereqs="cactus:webapp">
- <unwar src="${maven.war.build.dir}/${pom.id}.war"
- dest="${maven.cactus.build.dir}/weblogic7x/testdomain/applications/test">
- <patternset>
+ <copy todir="${maven.cactus.build.dir}/tomcat4x/webapps/test">
+ <fileset dir="${maven.cactus.build.dir}/${pom.id}">
<include name="WEB-INF/classes/**"/>
- </patternset>
- </unwar>
+ </fileset>
+ </copy>
</goal>
1.10 +10 -0 jakarta-turbine-maven/src/plugins-build/cactus/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/plugins-build/cactus/xdocs/changes.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- changes.xml 7 Nov 2002 13:42:27 -0000 1.9
+++ changes.xml 10 Nov 2002 16:10:35 -0000 1.10
@@ -7,6 +7,16 @@
<body>
<release version="1.1" date="in CVS">
+ <action dev="vmassol" type="update">
+ Creation of the project war/webapp is now left to the Maven War plugin.
+ Cactus repackages it by adding the Cactus tests, the Cactus
+ configuration files and the Cactus external jars. Thus, the Cactus
+ plugin now supports the "war:webapp" goal.
+ </action>
+ <action dev="vmassol" type="update">
+ Improved documentation: "news" section on front page and improved
+ "Quick Start" page.
+ </action>
<action dev="vmassol" type="add">
Support for WebLogic 7.x.
</action>
1.7 +25 -44 jakarta-turbine-maven/src/plugins-build/cactus/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/cactus/xdocs/index.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- index.xml 6 Nov 2002 21:37:03 -0000 1.6
+++ index.xml 10 Nov 2002 16:10:35 -0000 1.7
@@ -14,57 +14,38 @@
allows to automatically start containers, run Cactus tests and stop
the containers.
</p>
- <p>
- Check the <a href="features.html">features</a> page for all features
- of this plugin.
- </p>
<p>
Currently, this plugin only supports the Servlet API 2.3.
</p>
</section>
- <section name="Getting Started">
- <ol>
- <li>
- Create a <code>src/test-cactus</code> directory in your project and
- put your Cactus test classes in it (with the normal package directory
- structure).
- </li>
- <li>
- Create a <code>build.properties</code> file in your project root
- directory (where <code>project.xml</code> is located) and define in
- it the location of the container you wish to use for the tests. For
- example, if I wish to run the Cactus tests on Tomcat 4.1.10 and on
- Resin 2.4, I will write:
- </li>
-
-<source><![CDATA[
-maven.cactus.tomcat4x.home = C:/Apps/jakarta-tomcat-4.1.10
-maven.cactus.resin2x.home = C:/Apps/resin-2.1.4
-]]></source>
-
- <li>
- Then, simply type <code>maven cactus:test-tomcat-4x</code> for
- example to run the tests with Tomcat 4.x. You can type
- <code>maven -g</code> for a full list of the available goals.
- </li>
- <li>
- If you wish to generate Cactus HTML test reports, type
- <code>maven cactus:generate site</code>.
- </li>
- </ol>
-
+ <section name="News">
+ <table>
+ <tr>
+ <th>Date</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>06 Nov 2002</td>
+ <td>
+ Release of version 1.0. Read the announcement
+ <a
href="http://www.mail-archive.com/turbine-maven-user%40jakarta.apache.org/msg01876.html";>here</a>.
+ </td>
+ </tr>
+ </table>
+ </section>
+ <section name="Documentation roadmap">
<p>
- The plugin will automatically package your tests and classes under
- test in a webapp, deploy it, configure the container you have chosen,
- start the container, run the Cactus tests and stop the container.
+ Check the <a href="features.html">features</a> page for all features
+ of this plugin.
+ </p>
+ <p>
+ Then, you should read the <a href="using.html">Quick Start</a> page
+ which provides details about how to use the plugin.
</p>
-
- </section>
- <section name="Sample">
<p>
- A sample application is packaged within the Cactus plugin. Go to
- where you installed Maven and look into the
- <code>plugins/maven-cactus-plugin-*/sample</code> directory.
+ A sample application using Cactus is packaged within the Cactus plugin.
+ Go to where you installed Maven and look into the
+ <code>plugins/maven-cactus-plugin-*/sample</code> directory.
</p>
</section>
1.3 +1 -0
jakarta-turbine-maven/src/plugins-build/cactus/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/plugins-build/cactus/xdocs/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 7 Nov 2002 08:27:32 -0000 1.2
+++ navigation.xml 10 Nov 2002 16:10:35 -0000 1.3
@@ -10,6 +10,7 @@
</links>
<menu name="Overview">
<item name="Features" href="/features.html"/>
+ <item name="Quick Start" href="/using.html"/>
</menu>
<menu name="Downloads">
<item name="Cactus Plugin 1.0"
href="http://www.ibiblio.org/maven/maven/jars/maven-cactus-plugin-1.0.jar"/>
1.12 +11 -1 jakarta-turbine-maven/src/plugins-build/cactus/xdocs/tasks.xml
Index: tasks.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/cactus/xdocs/tasks.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tasks.xml 7 Nov 2002 13:48:08 -0000 1.11
+++ tasks.xml 10 Nov 2002 16:10:35 -0000 1.12
@@ -18,6 +18,15 @@
<li>
Describe plugin properties in the Maven plugin documentation.
</li>
+ <li>
+ Add automatic discovery of Cactus TestCase classes amongst the
+ Cactus source directory so that only test classes are executed
+ (support classes are not).
+ </li>
+ <li>
+ Add support for running the tests using the JUnit Swing Test
+ Runner.
+ </li>
</ul>
</p>
</subsection>
@@ -42,7 +51,8 @@
defined containers.
</li>
<li>
- Support packaging as an EAR for EJB unit testing. Requires the EAR
plugin first.
+ Support packaging as an EAR for EJB unit testing. Requires the
+ EAR plugin first.
</li>
</ul>
</p>
1.1 jakarta-turbine-maven/src/plugins-build/cactus/xdocs/using.xml
Index: using.xml
===================================================================
<?xml version="1.0"?>
<document>
<properties>
<title>Using the Maven Cactus Plug-in</title>
<author email="[EMAIL PROTECTED]">Vincent Massol</author>
</properties>
<body>
<section name="Using the Maven Cactus Plug-in">
<ol>
<li>
Create a <code>src/test-cactus</code> directory in your project and
put your Cactus test classes in it (with the normal package directory
structure). Note that the location of the Cactus test sources can be
configured through the <code>maven.cactus.src.dir</code> property.
</li>
<li>
Create a <code>build.properties</code> file in your project root
directory (where <code>project.xml</code> is located) and define in
it the location of the container you wish to use for the tests. For
example, if you wish to run the Cactus tests on Tomcat 4.1.10 and on
Resin 2.4, you will write:
</li>
<source><![CDATA[
maven.cactus.tomcat4x.home = C:/Apps/jakarta-tomcat-4.1.10
maven.cactus.resin2x.home = C:/Apps/resin-2.1.4
]]></source>
<li>
Call the
<a
href="http://jakarta.apache.org/turbine/maven/reference/plugins/war/index.html";>War</a>
plugin's goals to generate a war for your webapp. For example:
<code>maven war</code>. Note that in the future you would also be
able to call the Ear plugin if your application is an EAR.
</li>
<li>
Then, simply run the Cactus goal for your container. For example,
type <code>maven cactus:test-tomcat-4x</code> to run the tests with
Tomcat 4.x. You can type <code>maven -g</code> for a full list of the
available goals.
</li>
<li>
If you wish to generate Cactus HTML test reports, type
<code>maven cactus:generate site</code>.
</li>
</ol>
<p>
The plugin will automatically add what is needed for the Cactus tests
to your application WAR/webapp by repackaging it. In detail, it will
add the Cactus test classes, Cactus configuration files and Cactus jars
to your WAR/webapp. It will then deploy it, configure the container you
have chosen, start it, run the Cactus tests and stop the container.
</p>
<p>
It is possible (and recommended for performance reasons) to run all the
goals in one Maven invocation. For example:
<code>maven war cactus:test-tomcat-4x cactus:generate site</code>. You
can also put that sequence in your project's <code>maven.xml</code>
file.
</p>
</section>
</body>
</document>
--
To unsubscribe, e-mail: <mailto:turbine-maven-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:turbine-maven-dev-help@;jakarta.apache.org>
