You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2003/10/29 22:49:00 UTC
cvs commit: jakarta-cactus/integration/maven/xdocs changes.xml properties.xml features.xml tasks.xml index.xml goals.xml using.xml navigation.xml
vmassol 2003/10/29 13:49:00
Modified: integration/maven/xdocs changes.xml properties.xml
features.xml tasks.xml index.xml goals.xml
using.xml navigation.xml
Log:
Updated and improved docs.
Revision Changes Path
1.2 +3 -202 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changes.xml 29 Oct 2003 17:35:11 -0000 1.1
+++ changes.xml 29 Oct 2003 21:49:00 -0000 1.2
@@ -1,214 +1,15 @@
<?xml version="1.0"?>
<document>
<properties>
- <title>Changes</title>
+ <title>Plugin changes</title>
<author email="vmassol@apache.org">Vincent Massol</author>
</properties>
<body>
- <release version="3.2" date="in CVS">
- <action dev="vmassol" type="fix">
- Added documentation for <code>cactus.bundle</code> property that
- can be used in POM dependency list. This fixes bug
- <a href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-901">MAVEN-901</a>
- </action>
- <action dev="vmassol" type="update">
- Updated to use Cactus 1.5-rc1, HttpClient 2.0 rc2 and AspectJ 1.1.1.
- </action>
- </release>
-
- <release version="3.1" date="2003-09-15">
- <action dev="vmassol" type="add">
- New <code>cactus:jar-install</code> goal to install the Cactus
- jar in the local Maven repository. This is useful if you wish to
- put Cactus test classes in one Maven project and execute the
- Cactus tests in another project.
- </action>
- <action dev="vmassol" type="add">
- New <code>cactus:jar</code> goal to generate a jar containing
- the Cactus test classes.
- </action>
- <action dev="vmassol" type="add">
- Added new <code>cactus.tmp.dir</code> optional property to specify
- a location where Cactus will put its temporary files (mostly where
- it setup containers for execution). Defaults to
- <code>[java.io.tmpdir]/[containername]</code>.
- </action>
- <action dev="vmassol" type="update">
- Generate the Cactus test reports in the Cactus reports directory
- instead of directly in the Maven build directory. This fixes bug
- <a href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-669">MAVEN-669</a>
- and
- <a href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-671">MAVEN-671</a>.
- </action>
- <action dev="vmassol" type="update">
- Updated commons-httpclient dependency to 2.0 rc1, httpunit to
- 1.5.3 and nekohtml to 0.7.7.
- </action>
- <action dev="vmassol" type="add">
- Added new optional property <code>cactus.weblogic7x.beahome</code> to
- configure the location of BEA HOME for the WebLogic 7.x container. It
- is only needed if the BEA HOME location is not the parent
- directory of <code>cactus.home.weblogic7x</code>.
- </action>
- <action dev="vmassol" type="add">
- Added back support for WebLogic 7.x (it had somehow been dropped
- when we moved to the new Cactus/Ant integration in version 3.0).
- </action>
- <action dev="vmassol" type="update">
- Updated to Cactus 1.6dev-20030830 which has fixes for WebLogic 7.x
- support.
- </action>
- </release>
-
- <release version="3.0" date="2003-08-05">
- <action dev="dion" type="update">
- Upgrade to commons-logging 1.0.3
- </action>
- <action dev="epugh" type="add">
- New goal cactus:match added that allows you to run just matching testcases.
- Pass the testcase in using -Dtestmatch=MyTestCase. This brings to parity the
- cactus plugin with the test plugin for running types of tests.
- </action>
- <action dev="epugh" type="add">
- New goal cactus:single added that allows you to run just a single testcase.
- Pass the testcase in using -Dtestcase=my.single.TestCase.
- </action>
- <action dev="evenisse" type="fix">
- Add xml declaration to generated report. Fixed for character encoding.
- </action>
- <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
- <code><cactus.bundle>true</cactus.bundle></code> property
- in dependencies). For example, DBUnit would be a jar you would
- include in a Cactus test but not in a runtime war.
- </action>
- <action dev="vmassol" type="fix">
- Updated to Cactus/Ant of 19th of June 2003 which fixes a bug
- preventing JBoss to start correctly on unix machines (caused by
- an invalid URL file format on unix. Thanks to Chris Lenz for
- fixing it.
- </action>
- <action dev="vmassol" type="fix">
- The <code>cactus:compile</code> goal now correctly copy the non
- java files to the target class directory. Thanks to Florin Vancea for
- reporting this bug. This fixes bug
- <a href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-478">MAVEN-478</a>.
- </action>
- <action dev="vmassol" type="update">
- Major change: updated to use the Cactus/Ant integration built after
- 23rd of May 2003 (it is completely different from the Cactus/Ant
- integration used in version 2.0.
- </action>
- </release>
-
- <release version="2.0" date="2003-04-08">
- <action dev="vmassol" type="update">
- Complete rework of the plugin to use the Cactus/Ant Integration
- module from the Cactus project. Now using Cactus 1.5dev for J2EE
- 1.3, built from CVS on 7th of April 2003. Thus the Plugin feature
- are now those of the Cactus/Ant Integration module.
- </action>
- </release>
-
- <release version="1.2" date="2003-03-22">
- <action dev="epugh" type="fix">
- Upgraded scripts to work with Maven beta 8.
- </action>
- <action dev="epugh" type="fix">
- Checkstyle fixes for included Sample webapp.
- </action>
- <action dev="epugh" type="add">
- Add new target <code>cactus:test</code> that runs tests for
- all containers with a
- <code>maven.cactus.[container].home</code> property set.
- </action>
- <action dev="epugh" type="fix">
- <code>cactus:single</code> now builds all the code and then runs
- the testcase specified by the property
- <code>mavencactustestcase</code>. Example
- <code>maven cactus:single
- -Dmavencactustestcase=com.my.company.EasyTest</code>.
- </action>
- <action dev="epugh" type="fix">
- Commented out dvsl merging of web.xml due to changes in Maven.
- Instead uses either included default web.xml or one provided by
- <code>maven.cactus.webxml</code>.
- </action>
- <action dev="vmassol" type="add">
- Added Checkstyle report to Cactus plugin web site.
- </action>
- <action dev="vmassol" type="fix">
- The plugin now works even if not connected to the internet.
- </action>
- <action dev="vmassol" type="fix" due-to="Eric Pugh" due-to-email="EPugh@upstate.com">
- Fixed problem when the <code>web.xml</code> of the application to
- test was defining security configuration. The Cactus was adding its
- own but the web.xml DTD only supports one. The new implementation
- discards the application security information which is replaced by
- the Cactus definition.
- </action>
- </release>
-
- <release version="1.1" date="2002-11-16">
- <action dev="vmassol" type="add">
- Added support for HttpUnit integration out of the box (i.e. the
- HttpUnit jars are automatically added by the Cactus plugin).
- </action>
- <action dev="vmassol" type="add">
- Ability to exclude Cactus tests (for long running tests for example,
- in debug period).
- </action>
- <action dev="vmassol" type="update">
- The <code>web.xml</code> elements required for Cactus are now
- automatically added to the user project <code>web.xml</code>.
- </action>
- <action dev="vmassol" type="add">
- Added support for running the tests using the JUnit Swing Test Runner.
- Simply create the following Maven property
- <code>maven.cactus.testrunner = swing</code> to use the Swing Test
- Runner.
- </action>
- <action dev="vmassol" type="add">
- Added automatic discovery of Cactus Test Cases and ignore test support
- classes.
- </action>
- <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>
- </release>
-
- <release version="1.0" date="2002-11-06">
- <action dev="vmassol" type="add">
- Sample project showing how to use the Cactus plugin.
- </action>
- <action dev="vmassol" type="add">
- Generates HTML reports
- </action>
- <action dev="vmassol" type="add">
- Support for Resin 2.x.
- </action>
- <action dev="vmassol" type="add">
- Support for Tomcat 4.x (supports hot redeploy).
- </action>
+ <release version="1.6dev" date="in CVS">
<action dev="vmassol" type="add">
- Creation of the Cactus plugin
+ Moved the Cactus plugin from the Maven CVS to the Cactus CVS.
</action>
</release>
1.6 +1 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- properties.xml 29 Oct 2003 18:33:57 -0000 1.5
+++ properties.xml 29 Oct 2003 21:49:00 -0000 1.6
@@ -2,8 +2,7 @@
<document>
<properties>
- <title>Cactus Properties</title>
- <author email="dion@apache.org">dIon Gillard</author>
+ <title>Maven Cactus roperties</title>
<author email="vmassol@apache.org">Vincent Massol</author>
</properties>
<body>
1.2 +25 -23 jakarta-cactus/integration/maven/xdocs/features.xml
Index: features.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/features.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- features.xml 29 Oct 2003 17:35:11 -0000 1.1
+++ features.xml 29 Oct 2003 21:49:00 -0000 1.2
@@ -2,35 +2,37 @@
<document>
<properties>
- <title>Features of the Cactus plugin</title>
+ <title>Cactus plugin features</title>
<author email="vmassol@apache.org">Vincent Massol</author>
</properties>
<body>
- <section name="Cactus Plug-in Features">
+ <section name="Cactus plugin features">
<p>
- The Cactus plugin for Maven uses the
- <a href="http://jakarta.apache.org/cactus">Cactus/Ant
- integration</a> module. Thus benefits from all its features.
+ The following features are provided:
</p>
- <p>
- Some jars are used only for testing (for example, DbUnit). These
- jars can be entered as dependencies in the <code>project.xml</code>
- and tagged with <code>cactus.bundle</code>. When the Cactus plugin
- finds such jars it will automatically add them to the deployed war.
- For example:
- </p>
-<source><![CDATA[
- <dependency>
- <groupId>dbunit</groupId>>
- <artifactId>dbunit</artifactId>>
- <version>1.5.5</version>
- <properties>
- <cactus.bundle>true</cactus.bundle>
- </properties>
- </dependency>
-]]></source>
-
+ <ul>
+ <li>
+ Uses the
+ <a href="http://jakarta.apache.org/cactus/integration/ant/">Cactus
+ Ant integration</a>.
+ </li>
+ <li>
+ Create cactified war of your web application.
+ </li>
+ <li>
+ Start/stop containers automatically.
+ </li>
+ <li>
+ Deploy your web application automatically in the target containers.
+ </li>
+ <li>
+ Supports adding custom testing jars to the Cactus classpaths.
+ </li>
+ <li>
+ Supports Servlet API 2.3 only.
+ </li>
+ </ul>
</section>
</body>
</document>
1.2 +13 -24 jakarta-cactus/integration/maven/xdocs/tasks.xml
Index: tasks.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/tasks.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tasks.xml 29 Oct 2003 17:35:11 -0000 1.1
+++ tasks.xml 29 Oct 2003 21:49:00 -0000 1.2
@@ -2,7 +2,7 @@
<document>
<properties>
- <title>Tasks</title>
+ <title>Maven Cactus tasks</title>
<author email="vmassol@apache.org">Vincent Massol</author>
</properties>
@@ -11,29 +11,18 @@
<p>
Lists of todos and ideas for future versions.
</p>
-
- <subsection name="3.1">
- <p>
- <ul>
- <li>
- Refactor code in goals cactus:test, cactus:single, and cactus:match
- to share more code. Currently there is a lot of cut-n-paste code.
- Should use jelly tags to reuse code.
- </li>
- </ul>
- </p>
- <p>
- <ul>
- <li>
- Add support for Jetty (note: This should actually be added in the
- Cactus/Ant integration module and not in the Maven plugin), for
- better reuse.
- </li>
- </ul>
- </p>
- </subsection>
-
+ <ul>
+ <li>
+ Refactor code in goals cactus:test, cactus:single, and cactus:match
+ to share more code. Currently there is a lot of cut-n-paste code.
+ Should use jelly tags to reuse code.
+ </li>
+ <li>
+ Add support for Jetty (note: This should actually be added in the
+ Cactus/Ant integration module and not in the Maven plugin), for
+ better reuse.
+ </li>
+ </ul>
</section>
-
</body>
</document>
1.2 +8 -54 jakarta-cactus/integration/maven/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 29 Oct 2003 17:35:11 -0000 1.1
+++ index.xml 29 Oct 2003 21:49:00 -0000 1.2
@@ -2,20 +2,16 @@
<document>
<properties>
- <title>Maven Cactus Plug-in</title>
+ <title>Maven Cactus plugin</title>
<author email="vmassol@apache.org">Vincent Massol</author>
</properties>
<body>
- <section name="Maven Cactus Plug-in">
+ <section name="Maven Cactus plugin">
<p>
- This is a plugin for
- <a href="http://jakarta.apache.org/cactus">Cactus</a> that
- allows to automatically start containers, run Cactus tests and stop
- the containers.
- </p>
- <p>
- Currently, this plugin only supports the Servlet API 2.3.
+ This is a plugin for <a href="http://maven.apache.org/">Maven</a>
+ that allows to easily perform Cactus unit-testing with Maven. See
+ the <a href="features.html">features list</a> for more details.
</p>
</section>
<section name="News">
@@ -25,52 +21,10 @@
<th>Description</th>
</tr>
<tr>
- <td>26 Oct 2003</td>
- <td>
- Release of version 3.2. Read the
- <a href="http://cvs.apache.org/viewcvs.cgi/maven-plugins/cactus/announcements/3.2.ann?rev=1.2&content-type=text/vnd.viewcvs-markup">announcement</a>.
- </td>
- </tr>
- <tr>
- <td>15 Sep 2003</td>
- <td>
- Release of version 3.1. Read the
- <a href="http://cvs.apache.org/viewcvs.cgi/maven-plugins/cactus/announcements/3.1.ann?rev=1.1&content-type=text/vnd.viewcvs-markup">announcement</a>.
- </td>
- </tr>
- <tr>
- <td>05 Aug 2003</td>
- <td>
- Release of version 3.0. Read the
- <a href="http://cvs.apache.org/viewcvs.cgi/maven-plugins/cactus/announcements/3.0.ann?rev=1.1&content-type=text/vnd.viewcvs-markup">announcement</a>.
- </td>
- </tr>
- <tr>
- <td>08 Apr 2003</td>
- <td>
- Release of version 2.0. Read the
- <a href="http://cvs.apache.org/viewcvs.cgi/maven-plugins/cactus/announcements/2.0.ann?rev=1.1&content-type=text/vnd.viewcvs-markup">announcement</a>.
- </td>
- </tr>
- <tr>
- <td>22 Mar 2003</td>
- <td>
- Release of version 1.2. Read the
- <a href="http://cvs.apache.org/viewcvs.cgi/maven-plugins/cactus/announcements/1.2.ann?rev=1.1&content-type=text/vnd.viewcvs-markup">announcement</a>.
- </td>
- </tr>
- <tr>
- <td>16 Nov 2002</td>
- <td>
- Release of version 1.1. Read the
- <a href="http://cvs.apache.org/viewcvs.cgi/maven-plugins/cactus/announcements/1.1.ann?rev=1.1.1.1&content-type=text/vnd.viewcvs-markup">announcement</a>.
- </td>
- </tr>
- <tr>
- <td>06 Nov 2002</td>
+ <td>29 Oct 2003</td>
<td>
- Release of version 1.0. Read the
- <a href="http://cvs.apache.org/viewcvs.cgi/maven-plugins/cactus/announcements/1.0.ann?rev=1.1.1.1&content-type=text/vnd.viewcvs-markup">announcement</a>.
+ This plugin was previously hosted in the Maven project itself. It
+ has now moved to the Cactus project.
</td>
</tr>
</table>
1.2 +1 -2 jakarta-cactus/integration/maven/xdocs/goals.xml
Index: goals.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/goals.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- goals.xml 29 Oct 2003 17:35:11 -0000 1.1
+++ goals.xml 29 Oct 2003 21:49:00 -0000 1.2
@@ -2,8 +2,7 @@
<document>
<properties>
- <title>Maven cactus Plug-in Goals</title>
- <author email="dion@apache.org">dIon Gillard</author>
+ <title>Maven Cactus plugin goals</title>
<author email="vmassol@apache.org">Vincent Massol</author>
</properties>
<body>
1.2 +46 -5 jakarta-cactus/integration/maven/xdocs/using.xml
Index: using.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/using.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- using.xml 29 Oct 2003 17:35:11 -0000 1.1
+++ using.xml 29 Oct 2003 21:49:00 -0000 1.2
@@ -2,12 +2,37 @@
<document>
<properties>
- <title>Using the Maven Cactus Plug-in</title>
+ <title>Using the Maven Cactus plugin</title>
<author email="vmassol@apache.org">Vincent Massol</author>
</properties>
<body>
- <section name="Using the Maven Cactus Plug-in">
+ <section name="Installing the Cactus plugin">
+ <p>
+ There are 2 options to install the Cactus plugin in an existing Maven
+ installation:
+ </p>
+ <ul>
+ <li>
+ <strong>Automatic install</strong>: Call
+ <code>maven plugin:download -DgroupId=cactus -DartifactId=cactus-maven -Dversion={version}</code>
+ where <code>{version}</code> is the version to use. Maven will
+ automatically download the plugin and install it, uninstalling any
+ other version you may already have.
+ </li>
+ <li>
+ <strong>Manual install</strong>:
+ <a href="http://www.ibiblio.org/maven/cactus/plugins/">Download</a>
+ the Cactus plugin jar and copy it in
+ <code>{MAVEN_HOME}/plugins</code> where <code>{MAVEN_HOME}</code> is
+ the location where you have installed Maven. Make sure you also
+ remove any previous Cactus plugin from
+ <code>{MAVEN_HOME}/plugins</code> and delete your
+ <code>{USER_HOME}/.maven/plugins</code> directory.
+ </li>
+ </ul>
+ </section>
+ <section name="Using the Cactus plugin">
<ol>
<li>
Create a <code>src/test-cactus</code> directory in your project and
@@ -22,19 +47,35 @@
example, if you wish to run the Cactus tests on Tomcat 4.1.24 and on
Resin 2.6, you will write:
</li>
-
<source><![CDATA[
cactus.home.tomcat4x = C:/Apps/jakarta-tomcat-4.1.24
cactus.home.resin2x = C:/Apps/resin-2.1.6
]]></source>
-
<li>
Then, simply type <code>maven cactus:test</code> (or
<code>maven cactus</code> for short) to run the Cactus
tests.
</li>
</ol>
-
+ <subsection name="Custom test jars">
+ <p>
+ Some jars are used only for testing (for example, DbUnit). These
+ jars can be entered as dependencies in the <code>project.xml</code>
+ and tagged with <code>cactus.bundle</code>. When the Cactus plugin
+ finds such jars it will automatically add them to the deployed war.
+ For example:
+ </p>
+<source><![CDATA[
+ <dependency>
+ <groupId>dbunit</groupId>>
+ <artifactId>dbunit</artifactId>>
+ <version>1.5.5</version>
+ <properties>
+ <cactus.bundle>true</cactus.bundle>
+ </properties>
+ </dependency>
+]]></source>
+ </subsection>
</section>
</body>
1.2 +3 -12 jakarta-cactus/integration/maven/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 29 Oct 2003 17:35:11 -0000 1.1
+++ navigation.xml 29 Oct 2003 21:49:00 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Maven Cactus Plugin">
+<project name="Maven Cactus plugin">
- <title>Maven Cactus Plugin</title>
+ <title>Maven Cactus plugin</title>
<body>
<links>
@@ -10,18 +10,9 @@
</links>
<menu name="Overview">
<item name="Features" href="/features.html"/>
- <item name="Quick Start" href="/using.html"/>
+ <item name="Using" href="/using.html"/>
<item name="Goals" href="/goals.html"/>
<item name="Properties" href="/properties.html"/>
- </menu>
- <menu name="Downloads">
- <item name="Cactus Plugin 3.2" href="http://www.ibiblio.org/maven/maven/plugins/maven-cactus-plugin-3.2.jar"/>
- <item name="Cactus Plugin 3.1" href="http://www.ibiblio.org/maven/maven/plugins/maven-cactus-plugin-3.1.jar"/>
- <item name="Cactus Plugin 3.0" href="http://www.ibiblio.org/maven/maven/plugins/maven-cactus-plugin-3.0.jar"/>
- <item name="Cactus Plugin 2.0" href="http://www.ibiblio.org/maven/maven/plugins/maven-cactus-plugin-2.0.jar"/>
- <item name="Cactus Plugin 1.2" href="http://www.ibiblio.org/maven/maven/plugins/maven-cactus-plugin-1.2.jar"/>
- <item name="Cactus Plugin 1.1" href="http://www.ibiblio.org/maven/maven/plugins/maven-cactus-plugin-1.1.jar"/>
- <item name="Cactus Plugin 1.0" href="http://www.ibiblio.org/maven/maven/plugins/maven-cactus-plugin-1.0.jar"/>
</menu>
</body>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org