Author: ptahchiev
Date: Thu Jan 31 02:11:06 2008
New Revision: 617089

URL: http://svn.apache.org/viewvc?rev=617089&view=rev
Log:
Translated to the new release.

Added:
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/changes.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/features.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/goals.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/index.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/installing.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/navigation.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/properties.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/tasks.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/using.xml
Modified:
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/site.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/participating/howto_build.xml

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/site.xml?rev=617089&r1=617088&r2=617089&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/site.xml 
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/site.xml 
Thu Jan 31 02:11:06 2008
@@ -64,6 +64,11 @@
                                  <item name="RunServerTests Task" 
href="integration/ant/task_runservertests.html"/>
                                  <item name="WebXmlMerge Task" 
href="integration/ant/task_webxmlmerge.html"/>
                                </item>
+                               <item name="Browser" 
href="integration/integration_browser.html"/>
+                               <item name="Tomcat" 
href="integration/howto_tomcat.html"/>
+                               <item name="Maven" 
href="integration/maven/index.html"/>
+                               <item name="Various IDEs" 
href="integration/howto_ide.html"/>
+                               <item name="JUnitEE" 
href="integration/howto_junitee.html"/>
                        </item>
                        <item name="Participating" 
href="/participating/index.html" collapse="true">
                                <item name="About Us" 
href="/participating/contributors.html" />

Added: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/changes.xml?rev=617089&view=auto
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/changes.xml
 (added)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/changes.xml
 Thu Jan 31 02:11:06 2008
@@ -0,0 +1,233 @@
+<?xml version="1.0"?>
+<document>
+  <properties>
+    <title>Plugin changes</title>
+    <author email="[EMAIL PROTECTED]">Vincent Massol</author>
+  </properties>
+
+  <body>
+
+    <release version="versions newer than 1.7" date="...">
+      <action dev="felipeal" type="update">
+        Since version 1.7.1 of Cactus all changes are now recorded using
+        Apache's <a 
href="http://issues.apache.org/jira/browse/CACTUS";>JIRA</a>. The list of 
changes for an 
+        unreleased version is available in the 
+        <strong><a href="http://tinyurl.com/97vtw";>JIRA roadmap 
report</a></strong> 
+        and the released version changes in the 
+        <strong><a href="http://tinyurl.com/dl9ej";>JIRA changelog 
+        report</a></strong>.
+      </action>
+    </release>
+
+    <release version="1.7" date="2005-01-28">
+      <action dev="felipeal" type="fix" due-to="Brett Porter" 
issue="CACTUS-161">
+        Proper use of <code>maven.compile.target</code> and
+        <code>maven.compile.source</code> properties.
+      </action>
+      <action dev="felipeal" type="add" issue="CACTUS-158">
+        Added <code>jvmArgs</code> property to the containers tasks.
+      </action>
+      <action dev="vmassol" type="update" due-to="Henner Kollmann" 
issue="CACTUS-156">
+        Added optional <code>source</code> attribute from the java plugin for 
+        compiling cactus tests.
+      </action>
+      <action dev="felipeal" type="add" due-to="Nicolas Chalumeau" 
due-to-email="[EMAIL PROTECTED]" issue="CACTUS-132">
+        Allows Cactus to include some resources in the webapp classpath
+        (<code>WEB-INF/classes</code>), through the use of variable 
+        <code>cactus.resources.dirs</code>.
+      </action>
+      <action dev="felipeal" type="update" issue="CACTUS-129" due-to="Mark 
Lambert">
+        Updated AspectJ to 1.2.1, so Cactus compiles and run under JDK 1.5.
+      </action>
+      <action dev="felipeal" type="add" issue="CACTUS-128" due-to="Maxwell 
Grender-Jones">
+        Extended <code>cactus.sysproperties</code> property to the
+        <code>cactus:match</code> and <code>cactus:single</code> goals.
+      </action>
+      <action dev="felipeal" type="new" issue="CACTUS-146">
+        Goal <code>cactus:test</code> is not executed if property
+        <code>maven.test.skip</code> is set.
+      </action>
+      <action dev="felipeal" type="update" issue="CACTUS-139">
+        Cactus now uses HttpUnit 1.6.
+      </action>
+      <action dev="felipeal" type="update" issue="CACTUS-137">
+        Plugin is now buildable withouth any manual intervention.
+      </action>
+      <action dev="vmassol" type="update" issue="CACTUS-135" due-to="Felipe 
Leme">
+        The Cactus HTML JUnit report now displays the stack trace in case of 
+        failure.
+      </action>
+      <action dev="vmassol" type="fix" issue="CACTUS-64">
+        The plugin now correctly uses the <code>maven.war.build.dir</code>,
+        <code>maven.war.final.name</code>, <code>maven.ejb.build.dir</code>
+        and <code>maven.ejb.final.name</code> properties from the WAR and EJB
+        plugins instead of hard-coding the values. Note that as a result, the 
+        Cactus plugins now requires version 1.7+ of the WAR plugin and version
+        1.6+ of the EJB plugin.
+      </action>
+      <action dev="vmassol" type="fix">
+        Cactus now guesses automatically what Java source files are Cactus 
tests
+        when packaging tests in an EAR (it was already supported when running
+        tests packaged in a WAR).
+      </action>
+      <action dev="vmassol" type="add" issue="CACTUS-119">
+        Added new <code>cactus.jboss3x.config.dir</code> property which allows
+        users to specify the location of a custom JBoss server configuration
+        to use. This configuration, if specified, will be copied by the
+        &lt;cactus&gt; task to <code>cactus.jboss3x.tmp.dir</code>.
+      </action>        
+      <action dev="vmassol" type="add" issue="CACTUS-119">
+        Added new <code>cactus.jboss3x.tmp.dir</code> property which
+        points to where the JBoss server configuration for Cactus will be
+        created. It defaults to 
+        <code>${cactus.home.jboss3x}/server/cactus</code>.
+      </action>
+      <action dev="vmassol" type="add">
+        Added new <code>cactus.sysproperties</code> property to the 
+        Maven plugin for Cactus to allow passing system properties to
+        the client and server side Cactus JVMs.
+      </action>
+    </release>
+
+    <release version="1.6.1" date="2004-05-14"/>
+    
+    <release version="1.6" date="2004-05-08">
+      <action dev="vmassol" type="add" issue="CACTUS-102" due-to="Nicolas De 
Loof">
+        When calling <code>cactus:test</code>, only run the tests if there are
+        Cactus tests present in the filesystem (i.e. if the Cactus source
+        directory exists).
+      </action>
+      <action dev="vmassol" type="fix">
+        Added dependency on <code>commons-jelly-tags-xml</code>. It seems
+        this is required for some configurations of Maven.
+      </action>
+      <action dev="vmassol" type="update" due-to="Peter Bright" 
due-to-email="[EMAIL PROTECTED]">
+        Removed explicit dependencies on EAR and WAR plugins so that users are
+        free to install the versions they want to work with. As it was, we were
+        forcing them to use a specific version, which is bad.
+      </action>
+      <action dev="vmassol" type="add">
+        The <code>cactus:test</code> can now also be used to run tests packaged
+        in an EAR. However the <code>cactus.is.ear</code> property needs
+        to be set to <code>true</code> (it is <code>false</code> by default
+        thus packaging tests in a WAR).
+      </action>
+      <action dev="vmassol" type="fix" issue="CACTUS-98">
+        Aligning the EAR-ing behavior in the Cactus plugin for 
+        Maven with the behavior from the EAR Maven plugin. More specifically,
+        supports the new <code>&lt;ear.module&gt;</code> property tagging +
+        support for sar modules + fixes a bug in the generation of the EAR 
+        descriptor.
+      </action>
+      <action dev="vmassol" type="fix" due-to="Nicolas Chalumeau" 
due-to-email="[EMAIL PROTECTED]">
+        The <code>cactus:test-ear</code> goal was not using properly the
+        <code>cactus.test.includes</code>/<code>cactus.test.excludes</code> 
thus
+        leading to tests not being included/excluded.
+      </action>
+      <action dev="vmassol" type="update">
+        Updated the version of Commons HttpClient in the Cactus distribution 
+        to 2.0 final.
+      </action>
+      <action dev="vmassol" type="fix">
+        Aligned the EAR-ing behavior in the Cactus plugin (when using the
+        <code>cactus:test-ear</code> goal) with the behavior from the EAR Maven
+        plugin. More specifically the Cactus plugin now honors both the
+        <code>&lt;ear.bundle&gt;</code> property tagging, the
+        <code>maven.ear.src</code> property and the 
+        <code>maven.ear.manifest</code> property.
+      </action>
+      <action dev="vmassol" type="fix" issue="CACTUS-91" due-to="Archimedes 
Trajano" due-to-email="[EMAIL PROTECTED]">
+        Added support for running tests packaged as an EAR when the Cactus 
+        plugin is triggered by defining the Cactus report in 
+        <code>project.xml</code>.
+      </action>
+      <action dev="vmassol" type="fix">
+        When running Cactus tests on an EJB project, through 
+        <code>cactus:test-ear</code>, do not include the EJB sources in 
+        the cactified WAR inside the EAR we deploy.
+      </action>
+      <action dev="vmassol" type="add">
+        Added new <code>cactus.jboss3x.jndiport</code> property to specify
+        which JNDI port to use when shutting down JBoss. Defaults to 1099
+        (the JBoss default).
+      </action>
+      <action dev="vmassol" type="add">
+        Added support for Resin 3.x (above version 3.0.5).
+      </action>
+      <action dev="vmassol" type="add" issue="CACTUS-86" due-to="Stephane 
Nicoll" due-to-email="[EMAIL PROTECTED]">
+        Added support for custom ports when using JBoss. Please note that this
+        will only work with custom JBoss configs. The default config used by
+        Cactus uses port 8080 (that's the default JBoss config).
+      </action>
+      <action dev="vmassol" type="add">
+        Added 2 new properties to support debugging Cactus tests:
+        <code>cactus.logging.config.client</code> and
+        <code>cactus.logging.config.server</code>. They point to logging
+        config properties file.
+      </action>
+      <action dev="vmassol" type="add">
+        Added new optional <code>cactus.src.war</code> and
+        <code>cactus.src.ejb</code> properties to specify where to find the
+        artifacts to test using Cactus.
+      </action>
+      <action dev="vmassol" type="add" issue="CACTUS-72" due-to="Sean Timm" 
due-to-email="[EMAIL PROTECTED]">
+        Added 2 properties (<code>cactus.build.goal.war</code> and
+        <code>cactus.build.goal.ejb</code>) for defining which goal is called 
+        by Cactus to generate the war and ejb artifacts. They default to
+        <code>war:war</code> and <code>ejb:ejb</code> respectively.
+      </action>
+      <action dev="vmassol" type="add">
+        Added new optional <code>cactus.war</code> property. It specified the
+        location where to generate the cactified WAR. Note that this is 
+        also the name of the test context that will be used (except if 
+        the context is specified by other means such as in 
+        <code>application.xml</code> if the WAR is packaged in an EAR, 
+        etc). It defaults to
+        <code>${maven.build.dir}/${pom.artifactId}-cactus.war</code>.
+      </action>
+      <action dev="vmassol" type="add" due-to="Tony Czupryna" 
due-to-email="[EMAIL PROTECTED]">
+        Added support for the new <code>configxml</code> attribute used in the
+        <code>&lt;weblogic7x&gt;</code> element of the 
+        <code>&lt;cactus&gt;</code> task.
+      </action>
+      <action dev="vmassol" type="add" issue="CACTUS-72" due-to="Michael 
Gaffney" due-to-email="[EMAIL PROTECTED]">
+        Added support for EJB testing with Cactus. Calling 
+        <code>cactus:test-ear</code> packages the whole thing in an EAR and
+        executes the Cactus tests.
+      </action>
+      <action dev="vmassol" type="add">
+        The <code>cactus:test</code> goal now automatically discovers JUnit 
+        Test Cases from non JUnit java classes and by default excludes all 
+        classes that are not tests.
+      </action>
+      <action dev="vmassol" type="update">
+        Renamed properties <code>cactus.src.includes</code> and
+        <code>cactus.src.excludes</code> in <code>cactus.test.includes</code>
+        and <code>cactus.test.excludes</code>. The previous names were
+        misleading and some Cactus useres thought it referred to 
+        inclusion/exclusion of classes during the compilation. Please also note
+        that files to include/exclude are now <code>.class</code> files and no
+        longer <code>.java</code> files.
+      </action>
+      <action dev="vmassol" type="add">
+        When running reports, make sure Cactus tests do not fail the build.
+      </action>
+      <action dev="vmassol" type="fix">
+        Fixed bug
+        <a 
href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-1000";>MAVEN-1000</a>.
+        Cactus tests are now automatically started by default when the site is 
+        generated. This feature can be turned off.
+      </action>
+      <action dev="vmassol" type="fix" issue="CACTUS-64">
+        The plugin now correctly uses the <code>${maven.war.final.name}</code>
+        property instead of hard-coding the war name to 
+        <code>${pom.artifactId}.war</code>.
+      </action>
+      <action dev="vmassol" type="add">
+        Moved the Cactus plugin from the Maven CVS to the Cactus CVS.
+      </action>
+    </release>
+
+  </body>
+</document>
+

Added: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/features.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/features.xml?rev=617089&view=auto
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/features.xml
 (added)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/features.xml
 Thu Jan 31 02:11:06 2008
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<document>
+
+  <properties>
+    <title>Cactus plugin features</title>
+    <author email="[EMAIL PROTECTED]">Vincent Massol</author>
+  </properties>
+
+  <body>
+    <section name="Cactus plugin features">
+      <p>
+        The following features are provided:
+      </p>
+      <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>
+          Supports generating cactified EAR for deploying Cactus EJB tests.
+        </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>
+        <li>
+          Requires JDK 1.4 or superior.
+        </li>
+        <li>
+          Automatically discover test classes from non-test classes.
+        </li>
+      </ul>
+    </section>
+ </body>
+</document>

Added: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/goals.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/goals.xml?rev=617089&view=auto
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/goals.xml
 (added)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/goals.xml
 Thu Jan 31 02:11:06 2008
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+  <properties>
+    <title>Maven Cactus plugin goals</title>
+    <author email="[EMAIL PROTECTED]">Vincent Massol</author>
+  </properties>
+  <body>
+    <goals>
+      <goal>
+        <name>cactus:compile</name>
+        <description>
+          Compiles the Cactus tests.
+        </description>
+      </goal>
+      <goal>
+        <name>cactus:cactifywar</name>
+        <description>
+          Creates a Cactus-ready WAR from the application WAR. To be used
+          in WAR projects.
+        </description>
+      </goal>
+      <goal>
+        <name>cactus:cactifyear</name>
+        <description>
+          Creates a Cactus-ready EAR to unit test EJBs. To be used in EJB
+          projects.
+        </description>
+      </goal>
+      <goal>
+        <name>cactus:test</name>
+        <description>
+          Run the Cactus tests (packaged in a WAR) on the containers for which
+          you have defined a <code>cactus.home.[container name]</code> 
+          property.
+        </description>
+      </goal>
+      <goal>
+        <name>cactus:single</name>
+        <description>
+          Run a single Cactus test (packaged in a WAR) on the containers for 
+          which you have defined a <code>cactus.home.[container name]</code> 
+          property.  Pass the name of the testcase in using 
+          <code>-Dtestcase=my.single.TestCase</code>.
+        </description>
+      </goal>  
+      <goal>
+        <name>cactus:match</name>
+        <description>
+          Run all Cactus tests (packaged in a WAR) that match a property 
+          <code>-Dtestmatch=MyTestCase</code> on the containers for which you
+          have defined a <code>cactus.home.[container name]</code> property.
+        </description>
+      </goal>           
+      <goal>
+        <name>cactus:test-ear</name>
+        <description>
+          Run the Cactus tests (packaged in an EAR) on the containers for which
+          you have defined a <code>cactus.home.[container name]</code> 
+          property.
+        </description>
+      </goal>
+      <goal>
+        <name>cactus:report</name>
+        <description>
+          Generate an HTML report for the Cactus tests that been run. In order
+          to get this report as part of the generated web site, add the 
+          following to your <code>project.xml</code>:
+<source><![CDATA[
+  <reports>
+    [...]
+    <report>maven-cactus-plugin</report>
+    [...]
+  </reports>
+]]></source>
+        </description>
+      </goal>
+      <goal>
+        <name>cactus:jar</name>
+        <description>
+          Generate a jar containing the Cactus test classes.
+        </description>
+      </goal>
+      <goal>
+        <name>cactus:jar-install</name>
+        <description>
+          Installs the Cactus jar in your 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 Maven project.
+        </description>
+      </goal>
+    </goals>
+  </body>
+</document>
\ No newline at end of file

Added: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/index.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/index.xml?rev=617089&view=auto
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/index.xml
 (added)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/index.xml
 Thu Jan 31 02:11:06 2008
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<document>
+
+  <properties>
+    <title>Maven Cactus plugin</title>
+    <author email="[EMAIL PROTECTED]">Vincent Massol</author>
+  </properties>
+
+  <body>
+    <section name="Maven Cactus plugin">
+      <p>
+        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">
+      <table>
+        <tr>
+          <th>Date</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>28 Janv 2004</td>
+          <td>
+            Maven plugin 1.7 for Cactus is available. See the
+            <a href="changes-report.html">changes report</a> for the detailed 
+            list of changes. To install it, run:<br/>
+            <code>maven plugin:download -DartifactId=cactus-maven 
-DgroupId=cactus -Dversion=1.7</code>
+            <br/>Read the <a href="using.html">using guide</a> for more details
+            on installation and usage.
+          </td>
+        </tr>
+      </table>
+    </section>
+    <section name="Documentation roadmap">
+      <p>
+        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>
+      <p>
+        The latest changes are available <a 
href="changes-report.html">here</a>.
+      </p>
+    </section>
+
+ </body>
+</document>

Added: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/installing.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/installing.xml?rev=617089&view=auto
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/installing.xml
 (added)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/installing.xml
 Thu Jan 31 02:11:06 2008
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<document>
+
+  <properties>
+    <title>Installing the Maven Cactus plugin</title>
+    <author email="[EMAIL PROTECTED]">Vincent Massol</author>
+  </properties>
+
+  <body>
+    <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>
+      <note>
+        It is probable that your version of Maven already includes the Cactus
+        plugin (it was bundled with Maven not long ago). If this is the case
+        and if you want to install the new plugin, you need to remove the 
+        <code>maven-cactus-plugin</code> plugin from
+        <code>{MAVEN_HOME}/plugins</code> and delete your 
+        <code>{USER_HOME}/.maven/plugins</code> directory.
+      </note>
+      <note>
+        Older versions of the Cactus plugin can still be found
+        <a href="http://www.ibiblio.org/maven/maven/plugins/";>here</a>.
+      </note>
+    </section>
+
+ </body>
+</document>

Added: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/navigation.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/navigation.xml?rev=617089&view=auto
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/navigation.xml
 (added)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/navigation.xml
 Thu Jan 31 02:11:06 2008
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Maven Cactus plugin">
+
+  <title>Maven Cactus plugin</title>
+
+  <body>
+    <links>
+      <item name="Maven" href="http://maven.apache.org/"/>
+      <item name="Cactus" href="http://jakarta.apache.org/cactus/"/>
+    </links>
+    <menu name="Overview">
+      <item name="Features" href="/features.html"/>
+      <item name="Installing" href="/installing.html"/>
+      <item name="Using" href="/using.html"/>
+      <item name="Goals" href="/goals.html"/>
+      <item name="Properties" href="/properties.html"/>
+      <item name="Changes" href="http://tinyurl.com/dl9ej"/>
+    </menu>
+  </body>
+</project>

Added: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/properties.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/properties.xml?rev=617089&view=auto
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/properties.xml
 (added)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/properties.xml
 Thu Jan 31 02:11:06 2008
@@ -0,0 +1,745 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+  <properties>
+    <title>Maven Cactus properties</title>
+    <author email="[EMAIL PROTECTED]">Vincent Massol</author>
+  </properties>
+  <body>
+    <section name="Cactus Settings">
+      <table>
+        <tr>
+          <th>Property</th>
+          <th>Optional?</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>cactus.home.[container name]</td>
+          <td>At least one container</td>
+          <td>
+            <p>
+              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>resin3x</code>, 
+              <code>orion1x</code>, <code>orion2x</code>, <code>jboss3x</code>
+              and <code>weblogic7x</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.src.dir</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of the Cactus test cases. Default value is 
+              <code>src/test-cactus</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.port</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Port on which to start the containers. Default value is 
+              <code>8080</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.test.includes</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Lists of test classes that will be executed. Default value is
+              <code>**/*Test*.class</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.test.excludes</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Lists of test classes that will not be excluded. Default 
+              value is <code>**/All*Test*.class,**/Test*All.class</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.junit.usefile</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Decides whether the test result will be printed to the console or
+              not. Default value is <code>false</code>, meaning errors will be
+              displayed on the console.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.reports.dir</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of junit test reports for the Cactus tests.
+              Default value is 
+              <code>${cactus.target.dir}/test-cactus-reports</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.halt.on.error</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Decides whether to stop the build on test errors.
+              Default value is <code>true</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.halt.on.failure</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Decides whether to stop the build on test failures
+              Default value is <code>true</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.src.mergewebxml</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of a test-specific web.xml file that will be merged with
+              the application web.xml, during the War cactification. Note that 
+              by default the cactification already adds the Cactus redirector 
+              definitions.Decides whether to stop the build on test failures.
+              Example: 
+              <code>cactus.src.mergewebxml = 
${basedir}/src/conf/cactus-web.xml</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.printsummary</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              How summary information on test should be printed to the 
console. This 
+              property has the same meaning as the <code>printsummary</code> 
attribute
+              of the JUnit Ant task. Default value is
+              <code>cactus.printsummary = withOutAndErr</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.tmp.dir</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location where Cactus will put its temporary files (mostly where
+              it setups containers for execution). Default value is
+              <code>[java.io.tmpdir]/[containername]</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.execute.during.report</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Should Cactus tests be run whenever cactus:report is called
+              (e.g. when the web site is generated). Default value is
+              <code>true</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.j2ee.version</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              J2EE version for the generated appxml descriptor (needed only 
+              when testing EJBs with Cactus). Defaults to <code>1.3</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.src.war</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of war to cactify. Defaults to
+              <code>${maven.build.dir}/${pom.artifactId}.war</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.src.ejb</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of the EJB to test (for the test-ear goal only). 
+              Defaults to
+              
<code>${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.war</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location where to generate the cactified WAR. Note that this is 
+              also the name of the test context that will be used (except if 
+              the context is specified by other means such as in 
+              <code>application.xml</code> if the WAR is packaged in an EAR, 
+              etc). Defaults to
+              <code>${maven.build.dir}/${pom.artifactId}-cactus.war</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.ear</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location where to generate the cactified EAR. Defaults to
+              <code>${maven.build.dir}/${pom.artifactId}-cactus.ear</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.build.goal.war</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Goal that Cactus should call for generating the war artifact.
+              Default to <code>war:war</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.build.goal.ejb</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Goal that Cactus should call for generating the ejb artifact.
+              Default to <code>ejb:ejb</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.logging.config.client</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of client logging properties file to debug Cactus tests.
+              For example <code>cactus.logging.config.client = 
${basedir}/logging_client.properties</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.logging.config.server</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of server logging properties file to debug Cactus tests.
+              For example <code>cactus.logging.config.server = 
${basedir}/logging_server.properties</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.is.ear</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              If this is true then the <code>cactus:test</code> target will 
+              execute <code>cactus:test-ear</code>. Default value is 
+              <code>false</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.test.skip</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              If set to <code>true</code>, goal <code>cactus:test</code> will 
+              skip tests (it does not affects other goals though, like 
+              <code>cactus:test-war</code> and <code>cactus:test-ear</code>).
+              Default value is <code>${maven.test.skip}</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.sysproperties</td>
+          <td>Yes</td>
+          <td>
+            Use this property elements to specify system properties required
+            by the test class. These properties will be made available to the 
+            Cactus client side and server side JVMs during the execution of 
+            the test. You can specify several system properties by listing 
+            their names, separating them with spaces. Each property value is
+            defined as a separate Maven property.
+            For example:
+<source><![CDATA[
+cactus.sysproperties=prop1 basedir
+prop1=your value
+basedir=${basedir}
+]]>
+            </source>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.servlet.version</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Servlet version for the generated Cactus War file. Particularly 
+              useful when the project does not provide a web descriptor (<code>
+              web.xml</code>) - in this situation, the generated file
+              will be an empty descriptor for the Servlet API version defined
+              by this property.
+              Default value is <code>2.3</code> and currently only <code>
+              2.2</code> and <code>2.3</code> are supported.
+            </p>
+          </td>
+        </tr>
+      </table>
+    </section>
+
+    <section name="Cactus Path Settings">
+      <table>
+        <tr>
+          <th>Path Id</th>
+          <th>Optional?</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>cactus.compile.src.set</td>
+          <td>No</td>
+          <td>
+            <p>
+              Ant path containing the Java classes used by the
+              <code>cactus:compile</code> goal. This path is created by
+              the <code>cactus:init</code> goal ant initially populated with
+              only one path element (<code>${cactus.src.dir}</code> - if a
+              project requires multiple source directories, it could create a
+              <code>preGoal</code> which would add more elements in the path.
+              by a 
+            </p>
+          </td>
+        </tr>
+      </table>
+    </section>
+
+    <section name="Cactus/Generic Container Settings">
+      <table>
+        <tr>
+          <th>Property</th>
+          <th>Optional?</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>cactus.genericContainer.jvmArgs</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Arguments to be passed to a container's JVM (for instance,
+              <code>-Xms256m -Xmx800m</code>). Each container has an
+              equivalent property, which by default points to this one.
+            </p>
+          </td>
+        </tr>
+      </table>
+    </section>
+
+
+    <section name="Cactus/JBoss 3.x Settings">
+      <table>
+        <tr>
+          <th>Property</th>
+          <th>Optional?</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>cactus.jboss3x.config.name</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Name of the JBoss server configuration to use.
+              Default value is <code>default</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.jboss3x.tmp.dir</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Default tmp directory where the JBoss server configuration for 
+              Cactus will be created.
+              Default value is 
<code>${cactus.home.jboss3x}/server/cactus</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.jboss3x.config.dir</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of a custom user-specified server configuration which
+              will be copied to <code>cactus.jboss3x.tmp.dir</code> if 
+              specified. By default this property is not set.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.jboss3x.jndiport</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Name of the JNDI port on which JBoss is started. This is only 
+              used to shutdown JBoss. Defaults to <code>1099</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.jboss3x.jvmArgs</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Arguments to be passed to the container's JVM. Defaults to
+              <code>${cactus.genericContainer.jvmArgs}</code>.
+            </p>
+          </td>
+        </tr>
+      </table>
+    </section>
+
+    <section name="Cactus/Resin 2.x Settings">
+      <table>
+        <tr>
+          <th>Property</th>
+          <th>Optional?</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>cactus.resin2x.config</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of the Resin 2.x configuration file if you don't want 
+              to use the cactus-provided one.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.resin2x.jvmArgs</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Arguments to be passed to the container's JVM. Defaults to
+              <code>${cactus.genericContainer.jvmArgs}</code>.
+            </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>
+        </tr>
+        <tr>
+          <td>cactus.resin3x.jvmArgs</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Arguments to be passed to the container's JVM. Defaults to
+              <code>${cactus.genericContainer.jvmArgs}</code>.
+            </p>
+          </td>
+        </tr>
+      </table>
+    </section>
+    
+    <section name="Cactus/Orion 1.x Settings">
+      <table>
+        <tr>
+          <th>Property</th>
+          <th>Optional?</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>cactus.orion1x.jvmArgs</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Arguments to be passed to the container's JVM. Defaults to
+              <code>${cactus.genericContainer.jvmArgs}</code>.
+            </p>
+          </td>
+        </tr>
+      </table>
+    </section>
+
+    <section name="Cactus/Orion 2.x Settings">
+      <table>
+        <tr>
+          <th>Property</th>
+          <th>Optional?</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>cactus.orion2x.jvmArgs</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Arguments to be passed to the container's JVM. Defaults to
+              <code>${cactus.genericContainer.jvmArgs}</code>.
+            </p>
+          </td>
+        </tr>
+      </table>
+    </section>
+
+    <section name="Cactus/Tomcat 4.x Settings">
+      <table>
+        <tr>
+          <th>Property</th>
+          <th>Optional?</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>cactus.tomcat4x.config</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of the Tomcat 4.x configuration file if you don't want 
+              to use the cactus-provided one.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.tomcat4x.conf.dir</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of custom Tomcat 4.x configuration file that will be 
+              copied, overwriting the Cactus-provided configuration files.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.tomcat4x.conf.includes</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Configuration files located at 
+              <code>${cactus.tomcat4x.conf.dir</code> that should be included
+              in the Tomcat 4.x container set up by Cactus.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.tomcat4x.conf.excludes</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Configuration files located at 
+              <code>${cactus.tomcat4x.conf.dir</code> that should not be 
+              included in the Tomcat 4.x container set up by Cactus.
+            </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>
+        <tr>
+          <td>cactus.tomcat4x.jvmArgs</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Arguments to be passed to the container's JVM. Defaults to
+              <code>${cactus.genericContainer.jvmArgs}</code>.
+            </p>
+          </td>
+        </tr>
+      </table>
+    </section>
+
+    <section name="Cactus/Tomcat 5.x Settings">
+      <table>
+        <tr>
+          <th>Property</th>
+          <th>Optional?</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>cactus.tomcat5x.config</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of the Tomcat 5.x configuration file if you don't want 
+              to use the cactus-provided one.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.tomcat5x.conf.dir</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of custom Tomcat 5.x configuration file that will be 
+              copied, overwriting the Cactus-provided configuration files.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.tomcat5x.conf.includes</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Configuration files located at 
+              <code>${cactus.tomcat5x.conf.dir</code> that should be included
+              in the Tomcat 5.x container set up by Cactus.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.tomcat5x.conf.excludes</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Configuration files located at 
+              <code>${cactus.tomcat5x.conf.dir</code> that should not be 
+              included in the Tomcat 5.x container set up by Cactus.
+            </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>        
+        <tr>
+          <td>cactus.tomcat5x.jvmArgs</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Arguments to be passed to the container's JVM. Defaults to
+              <code>${cactus.genericContainer.jvmArgs}</code>.
+            </p>
+          </td>
+        </tr>
+      </table>
+    </section>
+
+    <section name="Cactus/WebLogic 7.x Settings">
+      <table>
+        <tr>
+          <th>Property</th>
+          <th>Optional?</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>cactus.weblogic7x.beahome</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of BEA HOME. If not specified it defaults to
+              the parent directory of <code>cactus.home.weblogic7x</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.weblogic7x.config</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of the WebLogic 7.x configuration file if you don't 
want 
+              to use the cactus-provided one.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.resources.dirs</td>
+          <td>Yes</td>
+          <td>
+            Comma-separated list of resources labels to be used to include 
resources in 
+            the classpath (WEB-INF/classes) of the generated Cactus Web 
Application. 
+            The mechanism to include/exclude files use these labels to define 
other properties: 
+            cactus.resources.[label].dir, cactus.resources.[label].includes 
and 
+            cactus.resources.[label].excludes.
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.resources.[label].dir</td>
+          <td>Yes</td>
+          <td>
+            Directory whose resources will be included in the war classpath. 
The [label] stands for the label name
+            in the cactus.resources.dirs list. 
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.resources.[label].includes</td>
+          <td>Yes</td>
+          <td>
+            Comma-separated list of Which files in the directory defined by 
cactus.resources.[label].dir should be included in the Cactus war.
+            Default value is <code>**/*</code>, which means all files are 
included.
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.resources.[label].excludes</td>
+          <td>Yes</td>
+          <td>
+            Comma-separated list of which files in the directory defined by 
cactus.resources.[label].dir should be included in the Cactus war.
+            Default value is none, which means no files are excluded.
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.weblogic.jvmArgs</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Arguments to be passed to the container's JVM. Defaults to
+              <code>${cactus.genericContainer.jvmArgs}</code>.
+            </p>
+          </td>
+        </tr>
+      </table>
+    </section>
+
+
+  </body>
+</document>

Added: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/tasks.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/tasks.xml?rev=617089&view=auto
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/tasks.xml
 (added)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/tasks.xml
 Thu Jan 31 02:11:06 2008
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<document>
+
+  <properties>
+    <title>Maven Cactus tasks</title>
+    <author email="[EMAIL PROTECTED]">Vincent Massol</author>
+  </properties>
+
+  <body>
+    <section name="Tasks">
+      <p>
+       Lists of todos and ideas for future versions.
+      </p>
+      <ul>
+        <li>
+          Refactor code in goals cactus:test, cactus:single, cactus:match
+          and cactus:test-ear 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>

Added: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/using.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/using.xml?rev=617089&view=auto
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/using.xml
 (added)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/maven/using.xml
 Thu Jan 31 02:11:06 2008
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<document>
+
+  <properties>
+    <title>Using the Maven Cactus plugin</title>
+    <author email="[EMAIL PROTECTED]">Vincent Massol</author>
+  </properties>
+
+  <body>
+    <section name="Using the Cactus plugin">
+      <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>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.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>
+      </ol>
+      <subsection name="Running tests packaged in a WAR">
+        <p>
+          If you're testing Servlets, Filters, JSPs or Taglibs, simply type
+          <code>maven cactus:test</code> (or <code>maven cactus</code> for 
+          short) to run the Cactus tests.
+        </p>
+      </subsection>
+      <subsection name="Running tests packaged in an EAR">
+        <p>
+          Make sure you have created a <code>src/webapp/WEB-INF/web.xml</code>
+          file. You can put inside the <code>&lt;ejb-ref&gt;</code> entries 
+          required to call your EJBs from your Cactus test case classes.
+        </p>
+        <p>
+          To start your EJB unit tests, simply type 
+          <code>maven cactus:test-ear</code>.
+        </p>
+      </subsection>
+      <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>
+</document>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/participating/howto_build.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/participating/howto_build.xml?rev=617089&r1=617088&r2=617089&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/participating/howto_build.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/participating/howto_build.xml
 Thu Jan 31 02:11:06 2008
@@ -398,6 +398,10 @@
             <dd>
               <a href="http://maven.apache.org/";>Maven</a> plugins for Cactus.
             </dd>
+            <dt>shared-api/</dt>
+            <dd>
+              Some shared resources that are used by all of the other 
integration componenets..
+            </dd>
           </dl>
         </dd>
         <dt>samples/</dt>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to