Author: felipeal
Date: Mon Apr 17 20:44:48 2006
New Revision: 394831
URL: http://svn.apache.org/viewcvs?rev=394831&view=rev
Log:
CACTUS-151: fixed use of Cargo Ant task, added htmlunit dependency and updated
documentation
Modified:
jakarta/cactus/trunk/documentation/docs/xdocs/integration/ant/index.xml
jakarta/cactus/trunk/documentation/docs/xdocs/integration/ant/navigation.xml
jakarta/cactus/trunk/documentation/docs/xdocs/integration/ant/task_cactus.xml
jakarta/cactus/trunk/samples/ejb/src/scripts/share/build.xml
jakarta/cactus/trunk/samples/jetty/src/script/build.xml
jakarta/cactus/trunk/samples/servlet/src/scripts/share/build.xml
Modified:
jakarta/cactus/trunk/documentation/docs/xdocs/integration/ant/index.xml
URL:
http://svn.apache.org/viewcvs/jakarta/cactus/trunk/documentation/docs/xdocs/integration/ant/index.xml?rev=394831&r1=394830&r2=394831&view=diff
==============================================================================
--- jakarta/cactus/trunk/documentation/docs/xdocs/integration/ant/index.xml
(original)
+++ jakarta/cactus/trunk/documentation/docs/xdocs/integration/ant/index.xml Mon
Apr 17 20:44:48 2006
@@ -134,6 +134,7 @@
| |- commons-httpclient.jar
| |- commons-logging.jar
| |- junit.jar
+ | |- htmlunit.jar
| |- aspectjrt.jar
|- src
| |- java
@@ -166,6 +167,7 @@
<pathelement location="lib/commons-httpclient.jar"/>
<pathelement location="lib/commons-logging.jar"/>
<pathelement location="lib/aspectjrt.jar"/>
+ <pathelement location="lib/htmlunit.jar"/>
</classpath>
</taskdef>
]]></source>
@@ -199,7 +201,7 @@
<table>
<caption>Ant tasks provided by Cactus</caption>
<tr>
- <th>CactifyWar</th>
+ <th><link href="site:task_cactifywar">CactifyWar</link></th>
<td>
This task can enhance a provided web application archive (WAR),
and add the elements required to run Cactus tests against it.
@@ -209,7 +211,7 @@
</td>
</tr>
<tr>
- <th>CactifyEar</th>
+ <th><link href="site:task_cactifyear">CactifyEar</link></th>
<td>
This task can enhance a provided Enterprise application
archive (EAR),
and add the elements required to run Cactus tests against it.
It can
@@ -217,31 +219,25 @@
</td>
</tr>
<tr>
- <th>Cactus</th>
+ <th><link href="site:task_cactus">Cactus</link></th>
<td>
This task extends the standard <code><junit></code> task
with the capability of running in-container tests.
</td>
</tr>
<tr>
- <th>CactusTests</th>
- <td>
- This task extends the standard <code><junit></code> task
- and is used in combination with Cargo for start/stop
containers when
- executes tests.
- </td>
- </tr>
- <tr>
- <th>RunServerTests</th>
+ <th><link
href="site:task_runservertests">RunServerTests</link></th>
<td>
This task is an alternative to the <code><cactus></code>
task that is more generic but harder to use. In contrast to
the <code><cactus></code> task, it is not an extension of
- the standard <code><junit></code> task.
+ the standard <code><junit></code> task and it is used in
+ combination with Cargo for start/stop containers when it
+ executes the tests.
</td>
</tr>
<tr>
- <th>WebXmlMerge</th>
+ <th><link href="site:task_webxmlmerge">WebXmlMerge</link></th>
<td>
This task can merge the definitions from two web deployment
descriptors into a new descriptor, and can thus be used to
Modified:
jakarta/cactus/trunk/documentation/docs/xdocs/integration/ant/navigation.xml
URL:
http://svn.apache.org/viewcvs/jakarta/cactus/trunk/documentation/docs/xdocs/integration/ant/navigation.xml?rev=394831&r1=394830&r2=394831&view=diff
==============================================================================
---
jakarta/cactus/trunk/documentation/docs/xdocs/integration/ant/navigation.xml
(original)
+++
jakarta/cactus/trunk/documentation/docs/xdocs/integration/ant/navigation.xml
Mon Apr 17 20:44:48 2006
@@ -36,6 +36,7 @@
<menu label="Ant Tasks">
<item id="task_cactifywar" label="CactifyWar"/>
<item id="task_cactifyear" label="CactifyEar"/>
+ <item id="task_cactus" label="Cactus"/>
<item id="task_cactustests" label="CactusTests"/>
<item id="task_runservertests" label="RunServerTests"/>
<item id="task_webxmlmerge" label="WebXmlMerge"/>
Modified:
jakarta/cactus/trunk/documentation/docs/xdocs/integration/ant/task_cactus.xml
URL:
http://svn.apache.org/viewcvs/jakarta/cactus/trunk/documentation/docs/xdocs/integration/ant/task_cactus.xml?rev=394831&r1=394830&r2=394831&view=diff
==============================================================================
---
jakarta/cactus/trunk/documentation/docs/xdocs/integration/ant/task_cactus.xml
(original)
+++
jakarta/cactus/trunk/documentation/docs/xdocs/integration/ant/task_cactus.xml
Mon Apr 17 20:44:48 2006
@@ -30,7 +30,9 @@
<section title="Cactus Task">
- <p>
+ <p><em>This task is deprecated and it might be not be available in future
Cactus versions!</em> Please use the <link
href="site:task_runservertests">RunServerTests</link> task instead.</p>
+
+ <p>
The task <strong>cactus</strong> is an extension of the
<strong>junit</strong> task that is included in Ant as an optional task.
<strong>cactus</strong> extends <strong>junit</strong> to enable
Modified: jakarta/cactus/trunk/samples/ejb/src/scripts/share/build.xml
URL:
http://svn.apache.org/viewcvs/jakarta/cactus/trunk/samples/ejb/src/scripts/share/build.xml?rev=394831&r1=394830&r2=394831&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/src/scripts/share/build.xml (original)
+++ jakarta/cactus/trunk/samples/ejb/src/scripts/share/build.xml Mon Apr 17
20:44:48 2006
@@ -107,6 +107,8 @@
location="../../lib/@commons.logging.jar.name@"/>
<property name="junit.jar"
location="../../lib/@junit.jar.name@"/>
+ <property name="htmlunit.jar"
+ location="../../lib/@htmlunit.jar.name@"/>
<path id="cactus.classpath">
<path refid="project.classpath"/>
<pathelement location="${aspectjrt.jar}"/>
@@ -117,6 +119,7 @@
<pathelement location="${commons.httpclient.jar}"/>
<pathelement location="${commons.logging.jar}"/>
<pathelement location="${junit.jar}"/>
+ <pathelement location="${htmlunit.jar}"/>
</path>
<!--
@@ -367,10 +370,10 @@
<mkdir dir="${target.dir}/@{containerKey}"/>
<mkdir dir="${target.dir}/@{containerKey}/config"/>
<cargo id="@{containerKey}" containerId="@{containerKey}" action="start"
- home="[EMAIL PROTECTED]"
+ home="[EMAIL PROTECTED]" wait="false"
log="${target.dir}/@{containerKey}/cargo_start.log"
output="${target.dir}/@{containerKey}/container_start.log">
- <configuration dir="${target.dir}/@{containerKey}/config">
+ <configuration home="${target.dir}/@{containerKey}/config">
<property name="cargo.servlet.port" value="${cactus.port}"/>
<property name="cargo.logging" value="high"/>
<deployable type="ear"
file="${target.dir}/${project.name.file}-cactified.ear"/>
Modified: jakarta/cactus/trunk/samples/jetty/src/script/build.xml
URL:
http://svn.apache.org/viewcvs/jakarta/cactus/trunk/samples/jetty/src/script/build.xml?rev=394831&r1=394830&r2=394831&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/jetty/src/script/build.xml (original)
+++ jakarta/cactus/trunk/samples/jetty/src/script/build.xml Mon Apr 17 20:44:48
2006
@@ -112,6 +112,8 @@
location="../../lib/@jetty.jar.name@"/>
<property name="junit.jar"
location="../../lib/@junit.jar.name@"/>
+ <property name="htmlunit.jar"
+ location="../../lib/@htmlunit.jar.name@"/>
<path id="cactus.classpath">
<path refid="project.classpath"/>
@@ -125,6 +127,7 @@
<pathelement location="${jasper-runtime.jar}"/>
<pathelement location="${jetty.jar}"/>
<pathelement location="${junit.jar}"/>
+ <pathelement location="${htmlunit.jar}"/>
<@[EMAIL PROTECTED] location="${clover.jar}"/@clover.end@>
</path>
Modified: jakarta/cactus/trunk/samples/servlet/src/scripts/share/build.xml
URL:
http://svn.apache.org/viewcvs/jakarta/cactus/trunk/samples/servlet/src/scripts/share/build.xml?rev=394831&r1=394830&r2=394831&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/servlet/src/scripts/share/build.xml (original)
+++ jakarta/cactus/trunk/samples/servlet/src/scripts/share/build.xml Mon Apr 17
20:44:48 2006
@@ -136,6 +136,7 @@
<pathelement location="${commons.httpclient.jar}"/>
<pathelement location="${commons.logging.jar}"/>
<pathelement location="${junit.jar}"/>
+ <pathelement location="${htmlunit.jar}"/>
</path>
<!--
@@ -330,10 +331,10 @@
<mkdir dir="${target.dir}/@{containerKey}"/>
<mkdir dir="${target.dir}/@{containerKey}/config"/>
<cargo id="@{containerKey}" containerId="@{containerKey}" action="start"
- home="[EMAIL PROTECTED]"
+ home="[EMAIL PROTECTED]" wait="false"
log="${target.dir}/@{containerKey}/cargo_start.log"
output="${target.dir}/@{containerKey}/container_start.log">
- <configuration dir="${target.dir}/@{containerKey}/config">
+ <configuration home="${target.dir}/@{containerKey}/config">
<property name="cargo.servlet.port" value="${cactus.port}"/>
<property name="cargo.servlet.users"
value="${cactus.securitytest.users}"/>
<property name="cargo.logging" value="high"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
