Author: ptahchiev
Date: Sat Mar 22 14:06:31 2008
New Revision: 640081
URL: http://svn.apache.org/viewvc?rev=640081&view=rev
Log:
Changes on the documentation.
Modified:
jakarta/cactus/trunk/cactus-site/src/site/resources/images/ecosystem.jpg
jakarta/cactus/trunk/cactus-site/src/site/site.xml
jakarta/cactus/trunk/cactus-site/src/site/xdoc/how_it_works.xml
jakarta/cactus/trunk/cactus-site/src/site/xdoc/howto_sample.xml
jakarta/cactus/trunk/cactus-site/src/site/xdoc/index.xml
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/ant/index.xml
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/ant/task_cactus1.8.xml
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/integration_browser.xml
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/maven/goals.xml
Modified:
jakarta/cactus/trunk/cactus-site/src/site/resources/images/ecosystem.jpg
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/resources/images/ecosystem.jpg?rev=640081&r1=640080&r2=640081&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/cactus/trunk/cactus-site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/site.xml?rev=640081&r1=640080&r2=640081&view=diff
==============================================================================
--- jakarta/cactus/trunk/cactus-site/src/site/site.xml (original)
+++ jakarta/cactus/trunk/cactus-site/src/site/site.xml Sat Mar 22 14:06:31 2008
@@ -67,7 +67,13 @@
</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="Maven"
href="integration/maven/index.html" collapse="true">
+ <item name="Features"
href="integration/maven/features.html"/>
+ <item name="Installing"
href="integration/maven/installing.html"/>
+ <item name="Using"
href="integration/maven/using.html"/>
+ <item name="Goals"
href="integration/maven/goals.html"/>
+ <item name="Properties"
href="integration/maven/properties.html"/>
+ </item>
<item name="Various IDEs"
href="integration/howto_ide.html"/>
<item name="JUnitEE"
href="integration/howto_junitee.html"/>
</item>
@@ -93,7 +99,7 @@
<item name="Cactus"
href="resources/resources_cactus.html"/>
<item name="Testing"
href="resources/resources_testing.html"/>
</item>
- <item name="Statistics" href="/stats/index.html"/>
+ <!--item name="Statistics" href="/stats/index.html"/-->
</menu>
<menu name="Translations">
<item name="French"
href="http://www.ressources-java.net/cactus"; target="_blank"/>
Modified: jakarta/cactus/trunk/cactus-site/src/site/xdoc/how_it_works.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/xdoc/how_it_works.xml?rev=640081&r1=640080&r2=640081&view=diff
==============================================================================
--- jakarta/cactus/trunk/cactus-site/src/site/xdoc/how_it_works.xml (original)
+++ jakarta/cactus/trunk/cactus-site/src/site/xdoc/how_it_works.xml Sat Mar 22
14:06:31 2008
@@ -181,13 +181,14 @@
</li>
</ul>
- <section title="Servlet Redirector Proxy">
+ <subsection name="Servlet Redirector Proxy">
+ <center>
<p class="image">
<img src="images/archi_servlet.jpg"
alt="Servlet Redirector Architecture"/>
</p>
-
- <p>
+ </center>
+ <p>
The client side opens 2 HTTP connections to the Servlet redirector.
Once to execute the tests and retrieve the servlet output stream
and
a second time to get the test result. This is to be able to get
@@ -197,12 +198,14 @@
connection.
</p>
- </section>
+ </subsection>
- <section title="JSP Redirector Proxy">
+ <subsection name="JSP Redirector Proxy">
+ <center>
<p class="image">
<img src="images/archi_jsp.jpg" alt="JSP Redirector Architecture"/>
</p>
+ </center>
<p>
The client side opens 2 HTTP connections to the JSP redirector.
Once to execute the tests and retrieve the servlet output stream
and
@@ -213,13 +216,14 @@
connection.
</p>
- </section>
+ </subsection>
- <section title="Filter Redirector Proxy">
+ <subsection name="Filter Redirector Proxy">
+ <center>
<p class="image">
<img src="images/archi_filter.jpg" alt="Filter Redirector
Architecture"/>
</p>
-
+ </center>
<p>
The client side opens 2 HTTP connections to the Filter redirector.
Once to execute the tests and retrieve the servlet output stream
and
@@ -230,7 +234,7 @@
connection.
</p>
- </section>
+ </subsection>
</section>
Modified: jakarta/cactus/trunk/cactus-site/src/site/xdoc/howto_sample.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/xdoc/howto_sample.xml?rev=640081&r1=640080&r2=640081&view=diff
==============================================================================
--- jakarta/cactus/trunk/cactus-site/src/site/xdoc/howto_sample.xml (original)
+++ jakarta/cactus/trunk/cactus-site/src/site/xdoc/howto_sample.xml Sat Mar 22
14:06:31 2008
@@ -38,24 +38,24 @@
There are some samples available as part of the documentation. The
samples depend on the kind of test case you are writing (Servlet,
Taglibs, Filters, ...). For this reason you'll find some samples
- in the <a href="howto_testcase.html">TestCase Howto</a>
+ in the <a href="writing/howto_testcase.html">TestCase Howto</a>
tutorial.
</p>
<p>
However, the majority of Cactus samples are in the form of source
samples. These samples are part of the Cactus distribution that
- you have downloaded (in the <code>sample/src</code> directory).
+ you have downloaded (in the <code>samples</code> directory).
</p>
<p>
The following section explains how to execute the Cactus Samples
- using Ant (the Samples are packaged to be executed with Ant).
+ using Ant or Maven2(the Maven2 execution only calls the Ant execution).
If you wish to integrate them in your own build system or in your
favorite IDE, you'll have to understand the principles first and
manually install them (read the
<a href="getting_started.html">Getting Started</a>
- and the <a href="howto_config.html">Configuration Howto</a>
+ and the <a href="integration/manual/howto_config.html">Configuration
Howto</a>
tutorials). Some detailed explanations for IDE integration
- are also available in the <a href="howto_ide.html">IDE Howto</a>
+ are also available in the <a href="integration/howto_ide.html">IDE
Howto</a>
tutorial.
</p>
@@ -74,55 +74,22 @@
A JVM (1.2 or above),
</li>
<li>
- A Servlet Engine (Servlet API 2.2 or above). The Cactus Sample
- Ant build script supports automatic running the Cactus unit
- tests on several Servlet Engines.
+ You don't need a servlet engine any more, since Cactus in
integrated with
+ Cargo and now Cargo tries to download a servlet container for you.
</li>
<li>
- Ant (see the <a href="howto_ant_install.html">"Installing
+ Ant (see the <a
href="integration/ant/howto_ant_install.html">"Installing
Ant"</a> tutorial).
</li>
<li>
- A Servlet/J2EE API jar corresponding to the Cactus Sample release
- you have downloaded (J2EE 1.2 or 1.3). You can download the
- jar from:
- <ul>
- <li>
- For Servlet API 2.2
- <ul>
- <li>
- From
- <a href="http://java.sun.com/j2ee/download.html";>Sun</a>
or from
- the <a
href="http://jakarta.apache.org/builds/jakarta-servletapi/";>Jakarta reference
- implementation</a>
- </li>
- </ul>
- </li>
- <li>
- For Servlet API 2.3
- <ul>
- <li>
- From
- <a href="http://java.sun.com/j2ee/download.html";>Sun</a>
or from
- the <a
href="http://jakarta.apache.org/builds/jakarta-servletapi/";>Jakarta reference
- implementation</a>
- </li>
- </ul>
- </li>
- <li>
- For the J2EE jar
- <ul>
- <li>
- From <a href="http://java.sun.com/j2ee/download.html";>J2EE
download
- page</a>
- </li>
- </ul>
- </li>
- </ul>
- You can put these libraries anywhere you want on your hard disk.
- You'll just have to specify the location where they are in the
- <code>build.properties</code> file, as described below.
+ <a href="http://ant.apache.org/ivy/";>Ivy</a> for copying the
dependencies from the <code>m2</code> repository.
+ The installation of Ivy is pretty straight-forward: simply place
the two <code>Ivy</code>
+ jars(<code>ivy-[version].jar</code> and
<code>ivy-core[version].jar</code>) in the <code>ANT_HOME/lib</code> directory.
</li>
+ <li>
+ <a href="http://maven.apache.org/";>Maven2</a> for getting the
dependencies.
+ </li>
+
</ul>
</subsection>
@@ -135,18 +102,9 @@
<ul>
<li>
Download the <a href="downloads.html">Cactus Sample</a> and
- unzip it in a directory. Let's call this directory
+ unzip it in a directory. Let's call the
<code>[downloaded_directory]/samples</code> directory
<em><code>sampleroot</code></em>.
</li>
- <li>
- Rename (or copy) the
- <em><code>sampleroot</code></em>
- <code>/build/build.properties.default</code> file
- to <code>build.properties</code>. This file defines the
dependencies
- between the Cactus Sample build process and your environment
- (location of external jars, home directory for installed servlet
- engine(s), ...). Edit this file to reflect your environment values.
- </li>
</ul>
</subsection>
@@ -155,9 +113,15 @@
<p>
Open a shell, cd to the <em><code>sampleroot</code></em>
- <code>/build</code> directory and type '<code>ant test.all</code>'.
- The tests will be executed on all the servlet engines you have
- defined in the <code>build.properties</code> file you have edited.
+ directory and select which samples you want to run. To run all of the
+ dependencies type in <code>sampleroot</code> the following:
<code>mvn install</code>.
+ If you want to run just one type of samples, cd to the corresponding
directory and
+ type agsain <code>mvn install</code>. What will happen is that Maven
will get all of the
+ dependencies(approximately 10-15 min.) and then will invoke Ant to
execute the tests.
+ Ant will call Cargo to get the container that is needed to execute
the tests in (approximately 5-10 min.)
+ and will execute the tests (approximately 2-3 mins.) As you can see
the majority of time
+ is spent on getting the dependencies and the containers. Hopefully
this is done only one time(dependencies)
+ or until you call <code>mvn clean</code>(containers).
</p>
</subsection>
Modified: jakarta/cactus/trunk/cactus-site/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/xdoc/index.xml?rev=640081&r1=640080&r2=640081&view=diff
==============================================================================
--- jakarta/cactus/trunk/cactus-site/src/site/xdoc/index.xml (original)
+++ jakarta/cactus/trunk/cactus-site/src/site/xdoc/index.xml Sat Mar 22
14:06:31 2008
@@ -45,33 +45,32 @@
executed inside the container.
</p>
<p class="image">
+ <center>
<img src="images/ecosystem.jpg" alt="The Cactus Ecosystem"
usemap="#ecosystem" style="float: center; margin-right: 1em;">
- <map name="ecosystem">
- <area shape="circle" href="index.html"
- alt="Cactus Framework" coords="225,200,35"/>
- <area shape="circle" href="integration/eclipse/index.html"
- alt="Eclipse Plugin" coords="165,145,35"/>
- <area shape="circle" href="integration/integration_browser.html"
- alt="Browser Integration" coords="305,220,35"/>
- <area shape="circle" href="integration/maven/index.html"
- alt="Maven Plugin" coords="390,175,35"/>
- <area shape="circle" href="http://strutstestcase.sourceforge.net/";
- alt="StrutsTestCase" coords="375,235,35"/>
- <area shape="circle" href="http://www.junitee.org/";
- alt="JUnitEE Runner" coords="345,295,35"/>
- <area shape="circle" href="http://www.visioncodified.com/";
- alt="Jenerator" coords="355,115,35"/>
- <area shape="circle" href="integration/integration_ant.html"
- alt="Ant Integration" coords="140,225,35"/>
- <area shape="circle" href="integration/integration_jetty.html"
- alt="Jetty Integration" coords="280,145,35"/>
- <area shape="circle" href="howto_sample.html"
- alt="Servlet Sample" coords="55,200,35"/>
- <area shape="circle" href="integration/manual/howto_config.html"
- alt="Manual Configuration" coords="225,270,35"/>
- </map>
+<map name="ecosystem">
+<!-- #$-:Image map file created by GIMP Image Map plug-in -->
+<!-- #$-:GIMP Image Map plug-in by Maurits Rijk -->
+<!-- #$-:Please do not edit lines starting with "#$" -->
+<!-- #$VERSION:2.3 -->
+<!-- #$AUTHOR:tahchiev -->
+<area shape="poly"
coords="58,91,39,103,38,127,72,146,104,132,106,103,80,87,82,88,71,87" alt="EJB
Sample" href="howto_sample.html"/>
+<area shape="poly"
coords="46,148,23,157,17,173,26,193,55,203,81,192,90,174,80,154,58,148"
alt="Servlet Sample" href="howto_sample.html" />
+<area shape="poly"
coords="47,211,35,229,40,250,61,257,88,259,104,242,107,222,88,206,69,204,50,208"
alt="Jetty Sample" href="howto_sample.html" />
+<area shape="poly"
coords="124,146,103,159,96,166,98,181,108,198,129,201,149,199,168,184,164,162,158,151,146,147,130,146,128,146"
alt="Ant Integration" href="integration/integration_ant.html" />
+<area shape="poly"
coords="153,205,142,214,132,225,137,244,146,256,171,259,189,252,203,242,206,222,192,208,181,204,165,203"
alt="Manual Configuration" href="integration/manual/howto_config.html" />
+<area shape="poly"
coords="227,208,216,223,218,239,237,256,259,257,285,244,289,224,281,209,267,205,252,201,240,203"
alt="Browser Integration" href="integration/integration_browser.html" />
+<area shape="poly"
coords="253,171,259,187,272,200,286,202,299,202,321,192,328,176,316,152,300,148,284,147,270,153,258,160,257,162,257,160"
alt="Jetty Integration" href="integration/integration_jetty.html" />
+<area shape="poly"
coords="225,99,217,110,217,126,227,140,240,146,250,147,260,145,282,136,287,123,288,109,280,100,266,90,248,91,234,92"
alt="Maven Plugin" href="integration/maven/index.html" />
+<area shape="poly"
coords="136,103,136,127,149,140,171,146,187,142,202,132,206,123,206,111,198,103,192,94,178,90,166,89,151,94"
alt="Eclipse Plugin" href="integration/eclipse/index.html" />
+<area shape="poly"
coords="203,139,187,146,177,153,169,163,169,178,174,195,186,203,205,207,221,207,244,197,253,181,253,163,244,152,235,145,221,139,210,141,198,141"
alt="Cactus Framework" href="index.html" />
+<area shape="poly"
coords="307,74,296,91,298,99,304,109,311,117,320,122,330,124,341,122,350,118,363,112,369,102,369,92,367,79,356,71,351,69,341,69,334,67,326,68,315,70"
alt="Jenerator" href="http://www.visioncodified.com/"; />
+<area shape="poly"
coords="336,127,328,144,329,154,334,164,341,168,351,173,356,176,367,176,373,176,381,176,387,163,396,167,401,159,401,147,395,132,391,125,383,121,374,122,365,122,357,124,351,124,345,124"
alt="StrutsTestCase" href="http://strutstestcase.sourceforge.net/"; />
+<area shape="poly"
coords="336,185,329,197,329,208,333,221,339,225,345,230,362,235,373,235,381,235,389,226,392,222,396,216,400,210,401,203,401,196,394,186,386,182,380,178,376,178,366,178,358,180,354,182,346,182,340,184,333,188"
alt="JUnitEE Runner" href="http://www.junitee.org/"; />
+<area shape="poly"
coords="299,242,291,248,291,259,291,270,301,281,315,285,331,289,346,289,358,273,363,263,363,252,357,243,353,235,343,231,332,227,319,229,310,233,304,237,296,241"
alt="JSFUnit" href="http://labs.jboss.com/jsfunit/"; />
+</map>
</img>
+ </center>
</p>
<p>
The Cactus Ecosystem is made of several components:
Modified:
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/ant/index.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/ant/index.xml?rev=640081&r1=640080&r2=640081&view=diff
==============================================================================
--- jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/ant/index.xml
(original)
+++ jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/ant/index.xml
Sat Mar 22 14:06:31 2008
@@ -121,18 +121,26 @@
It is recommended that you copy these JARs into the project for which
you are writing Cactus tests. A common pattern is to have a
<code>lib</code> directory in the project directory, and put all the
- JARs there. So your project might look something like this:
+ JARs there. <br/>
+ <b>WARNING!: Since Cactus 1.8 you need the two
<code>cargo-ant.jar</code>
+ and <code>cargo-uberjar.jar</code> jars
+ in your classpath, since cactus relies on the cargo project.</b>
<br/>
+ So your project might look something like this:
<source><![CDATA[
[your project]
|- doc
| ...
|- lib
- | |- cactus.jar
+ | |- cactus.core.framework.uberjar.<VERSION>.jar
+ | |- cactus.integration.shared.api.<VERSION>.jar
+ | |- cactus.integration.ant.<VERSION>.jar
| |- cactus-ant.jar
| |- commons-httpclient.jar
| |- commons-logging.jar
| |- junit.jar
| |- aspectjrt.jar
+ | |- cargo-ant.jar
+ | |- cargo-uberjar.jar
|- src
| |- java
| | ...
@@ -157,8 +165,11 @@
<!-- Define the Cactus tasks -->
<taskdef resource="cactus.tasks">
<classpath>
- <pathelement location="lib/cactus.jar"/>
- <pathelement location="lib/cactus-ant.jar"/>
+ <pathelement location="lib/cactus.core.framework.uberjar.<VERSION>.jar"/>
+ <pathelement location="cactus.integration.shared.api.<VERSION>.jar"/>
+ <pathelement location="cactus.integration.ant.<VERSION>.jar"/>
+ <pathelement location="cargo-ant.jar"/>
+ <pathelement location="cargo-uberjar.jar"/>
<pathelement location="lib/commons-httpclient.jar"/>
<pathelement location="lib/commons-logging.jar"/>
<pathelement location="lib/aspectjrt.jar"/>
Modified:
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/ant/task_cactus1.8.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/ant/task_cactus1.8.xml?rev=640081&r1=640080&r2=640081&view=diff
==============================================================================
---
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/ant/task_cactus1.8.xml
(original)
+++
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/ant/task_cactus1.8.xml
Sat Mar 22 14:06:31 2008
@@ -252,109 +252,63 @@
<p>
The following example demonstrates how to run a suite of Cactus tests
- against three contains with builtin support (JBoss 3, Resin 2 and
- Tomcat 4).
+ against two containers (Tomcat 4 and Tomcat5). The <code>cargo</code>
task
+ in this case is configured with the <code>zipurlinstaller</code>, so
the
+ containers will be downloaded from the specified URL and then the
execution
+ will proceed. More on configuring the <code>cargo</code> task, you can
look on
+ the <a href="http://cargo.codehaus.org/";>Cargo site</a>.
</p>
<source>
-
- <![CDATA[
-<cactus warfile="${test.dir}/test.war"
- printsummary="yes" failureproperty="tests.failed">
- <classpath>
- <path refid="cactus.classpath"/>
- <pathelement location="${build.classes.dir}"/>
- <pathelement location="${test.classes.dir}"/>
- </classpath>
- <containerset>
- <jboss2x dir="${jboss3x.home}" config="default"
- todir="${test.reports.dir}/jboss3x"/>
- <resin2x dir="${resin2x.home}" port="8080"
- todir="${test.reports.dir}/resin2x"/>
- <tomcat4x dir="${tomcat4x.home}" port="8080"
- todir="${test.reports.dir}/tomcat4x"/>
- </containerset>
- <formatter type="xml"/>
- <batchtest>
- <fileset dir="${src.test.dir}">
- <include name="**/Test*.java"/>
- <exclude name="**/TestAll.java"/>
- </fileset>
- </batchtest>
-</cactus>
-]]>
-
+<pre>
<![CDATA[
- <cactus warfile="${cactified.servlet.archive.name}"
- printsummary="yes">
- <classpath>
- <path refid="cactus.classpath"/>
- <pathelement location="${build.dir}"/>
- <pathelement
location="${ivy.lib.dir}/htmlunit-1.10.jar"/>
- </classpath>
- <containerset>
- <cargo containerId="${tomcat.container.id}"
output="${logs.dir}/output.log" log="${logs.dir}/cargo.log">
- <zipUrlInstaller
-
installUrl="http://apache.speedbone.de/tomcat/tomcat-5/v5.5.25/bin/apache-tomcat-5.5.25.zip";
- installDir="${target.dir}/${tomcat.container.id}"/>
- <configuration>
- <property
name="cargo.servlet.port" value="${cargo.servlet.port}"/>
- <property name="cargo.logging"
value="${cargo.logging}"/>
- <deployable
type="${cactus.sample.archive.type}" file="${cactified.servlet.archive.name}"/>
- </configuration>
- </cargo>
- </containerset>
- <sysproperty key="prop1" value="value1"/>
- <sysproperty key="prop2" value="value2"/>
- <formatter type="${cactus.formatter.type}"/>
- <batchtest todir="${reports.dir}">
- <fileset dir="${src.dir}"> <!--
cactus.src.dir ?-->
- <include name="**/Test*.java"/>
- </fileset>
- </batchtest>
- </cactus>
+<cactus warfile="${cactified.servlet.archive.name}"
+printsummary="yes">
+ <classpath>
+ <path refid="cactus.classpath"/>
+ <pathelement location="${build.dir}"/>
+ <pathelement location="${ivy.lib.dir}/htmlunit-1.10.jar"/>
+ </classpath>
+ <containerset>
+ <cargo containerId="tomcat5x" output="${logs.dir}/output.log"
log="${logs.dir}/cargo.log">
+ <zipUrlInstaller
+ installUrl="${tomca5x.url}"
+ installDir="${target.dir}/${tomcat.container.id}"/>
+ <configuration>
+ <property name="cargo.servlet.port"
value="${cargo.servlet.port}"/>
+ <property name="cargo.logging" value="${cargo.logging}"/>
+ <deployable type="${cactus.sample.archive.type}"
+ file="${cactified.servlet.archive.name}"/>
+ </configuration>
+ </cargo>
+
+ <cargo containerId="tomcat4x" output="${logs.dir}/output.log"
log="${logs.dir}/cargo.log">
+ <zipUrlInstaller
+ installUrl="$"{tomcat4x.url}
+ installDir="${target.dir}/${tomcat.container.id}"/>
+ <configuration>
+ <property name="cargo.servlet.port"
value="${cargo.servlet.port}"/>
+ <property name="cargo.logging" value="${cargo.logging}"/>
+ <deployable type="${cactus.sample.archive.type}"
+ file="${cactified.servlet.archive.name}"/>
+ </configuration>
+ </cargo>
+ </containerset>
+
+ <sysproperty key="prop1" value="value1"/>
+ <sysproperty key="prop2" value="value2"/>
+
+ <formatter type="${cactus.formatter.type}"/>
+
+ <batchtest todir="${reports.dir}">
+ <fileset dir="${cactus.src.dir}">
+ <include name="**/Test*.java"/>
+ </fileset>
+ </batchtest>
+</cactus>
]]>
-
-
-
+</pre>
</source>
-
- <p>
- The next example shows the use of the <strong>generic</strong>
- container element for starting/stopping a custom container. You need
- to define the two targets <em>mycontainer.start</em> and
- <em>mycontainer.stop</em>, so that the container is started up (on
- port 8080) before the tests are run, and shut down after the tests
- completed. How these targets are implemented is highly dependant on
- the container. Most likely you'll need to copy some files and use
- the <strong><java></strong> task to invoke a container-provided
- Java class that can start/stop the container.
- </p>
-
- <source><![CDATA[
-<cactus warfile="${test.dir}/test.war"
- printsummary="yes" failureproperty="tests.failed">
- <classpath>
- <path refid="cactus.runtime.classpath"/>
- <pathelement location="${build.classes.dir}"/>
- <pathelement location="${test.classes.dir}"/>
- </classpath>
- <containerset>
- <generic name="My Container" port="8080">
- <startup target="mycontainer.start"/>
- <shutdown target="mycontainer.stop"/>
- </generic>
- </containerset>
- <formatter type="xml"/>
- <batchtest>
- <fileset dir="${src.test.dir}">
- <include name="**/Test*.java"/>
- <exclude name="**/TestAll.java"/>
- </fileset>
- </batchtest>
-</cactus>
-]]></source>
-
- </section>
+</section>
</body>
</document>
Modified:
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/integration_browser.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/integration_browser.xml?rev=640081&r1=640080&r2=640081&view=diff
==============================================================================
---
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/integration_browser.xml
(original)
+++
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/integration_browser.xml
Sat Mar 22 14:06:31 2008
@@ -102,9 +102,11 @@
</li>
</ul>
- <p>
+ <p class="image">
Here is an example of what you will get:<br/>
- <img src="../images/servlettestrunner_xml.jpg" alt="XML output of
ServletTestRunner"/>
+ <center>
+ <img src="../images/servlettestrunner_xml.jpg" alt="XML output of
ServletTestRunner"/>
+ </center>
</p>
<note>
@@ -123,8 +125,10 @@
<code>http://server:port/mywebapp/ServletTestRunner?suite=mytestcase&xsl=cactus-report.xsl</code>.
You should see the following:
</p>
- <p>
+ <p class="image">
+ <center>
<img src="../images/servlettestrunner_html.jpg" alt="HTML output of
ServletTestRunner"/>
+ </center>
</p>
<note>
This will work with Internet Explorer as the XSL transformation is
Modified:
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/maven/goals.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/maven/goals.xml?rev=640081&r1=640080&r2=640081&view=diff
==============================================================================
--- jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/maven/goals.xml
(original)
+++ jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/maven/goals.xml
Sat Mar 22 14:06:31 2008
@@ -6,63 +6,68 @@
<author email="[EMAIL PROTECTED]">Vincent Massol</author>
</properties>
<body>
- <goals>
- <goal>
- <name>cactus:compile</name>
- <description>
+ <section name="Goals">
+ <table>
+ <tr>
+ <th>Goal</th>
+ <th>td</th>
+ </tr>
+ <tr>
+ <td>cactus:compile</td>
+ <td>
Compiles the Cactus tests.
- </description>
- </goal>
- <goal>
- <name>cactus:cactifywar</name>
- <description>
+ </td>
+ </tr>
+ <tr>
+ <td>cactus:cactifywar</td>
+ <td>
Creates a Cactus-ready WAR from the application WAR. To be used
in WAR projects.
- </description>
- </goal>
- <goal>
- <name>cactus:cactifyear</name>
- <description>
+ </td>
+ </tr>
+ <tr>
+ <td>cactus:cactifyear</td>
+ <td>
Creates a Cactus-ready EAR to unit test EJBs. To be used in EJB
projects.
- </description>
- </goal>
- <goal>
- <name>cactus:test</name>
- <description>
+ </td>
+ </tr>
+ <tr>
+ <td>cactus:test</td>
+ <td>
Run the Cactus tests (packaged in a WAR) on the containers for which
- you have defined a <code>cactus.home.[container name]</code>
+ you have defined a <code>cactus.home.[container td]</code>
property.
- </description>
- </goal>
- <goal>
- <name>cactus:single</name>
- <description>
+ </td>
+ </tr>
+ <tr>
+ <td>cactus:single</td>
+ <td>
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
+ which you have defined a <code>cactus.home.[container td]</code>
+ property. Pass the td of the testcase in using
<code>-Dtestcase=my.single.TestCase</code>.
- </description>
- </goal>
- <goal>
- <name>cactus:match</name>
- <description>
+ </td>
+ </tr>
+ <tr>
+ <td>cactus:match</td>
+ <td>
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>
+ have defined a <code>cactus.home.[container td]</code> property.
+ </td>
+ </tr>
+ <tr>
+ <td>cactus:test-ear</td>
+ <td>
Run the Cactus tests (packaged in an EAR) on the containers for which
- you have defined a <code>cactus.home.[container name]</code>
+ you have defined a <code>cactus.home.[container td]</code>
property.
- </description>
- </goal>
- <goal>
- <name>cactus:report</name>
- <description>
+ </td>
+ </tr>
+ <tr>
+ <td>cactus:report</td>
+ <td>
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>:
@@ -73,22 +78,23 @@
[...]
</reports>
]]></source>
- </description>
- </goal>
- <goal>
- <name>cactus:jar</name>
- <description>
+ </td>
+ </tr>
+ <tr>
+ <td>cactus:jar</td>
+ <td>
Generate a jar containing the Cactus test classes.
- </description>
- </goal>
- <goal>
- <name>cactus:jar-install</name>
- <description>
+ </td>
+ </tr>
+ <tr>
+ <td>cactus:jar-install</td>
+ <td>
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>
+ </td>
+ </tr>
+ </table>
+ </section>
</body>
-</document>
\ No newline at end of file
+</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
