Author: ptahchiev
Date: Fri Jan 4 09:00:25 2008
New Revision: 608920
URL: http://svn.apache.org/viewvc?rev=608920&view=rev
Log:
Added some changes in the cactus-site, and also added antrun-plugin in the
maven2 integration.
Removed:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/src/main/java/
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/src/test/
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/samples-servlet-javaEE-12/
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/samples-servlet-javaEE-13/
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/samples-servlet-share/
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/.classpath
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/site.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/features.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/getting_started.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/how_it_works.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/howto_ant_cactus.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/index.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/task_cactifyear.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/task_cactus.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/task_webxmlmerge.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/eclipse/index.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/eclipse/webapp_plugin.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/index.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/manual/howto_classpath.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/manual/howto_config.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/manual/index.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java/org/apache/cactus/integration/ant/CactifyWarTask.java
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/pom.xml
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/.classpath
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/.classpath?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/.classpath (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/.classpath Fri Jan 4 09:00:25
2008
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER"
kind="con"/>
- <classpathentry path="integration/ant/src/main/java" kind="src"/>
<classpathentry
path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"
kind="var"/>
<classpathentry path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" kind="var"/>
<classpathentry
path="M2_REPO/org/codehaus/cargo/cargo-core-api-container/0.9/cargo-core-api-container-0.9.jar"
kind="var"/>
@@ -16,11 +15,8 @@
<classpathentry
path="M2_REPO/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"
kind="var"/>
<classpathentry path="framework/framework-13-14/src/main/java"
kind="src"/>
<classpathentry path="framework/framework-12-13-14/src/test/java"
kind="src"/>
- <classpathentry path="integration/apis/src/main/java" kind="src"/>
<classpathentry
path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar"
kind="var"/>
- <classpathentry path="integration/m2/src/test/java" kind="src"/>
<classpathentry
path="M2_REPO/org/apache/cactus/integration/m2/cactus-m2-plugin/1.0-SNAPSHOT/cactus-m2-plugin-1.0-SNAPSHOT.jar"
kind="var"/>
- <classpathentry path="integration/m2/src/main/java" kind="src"/>
<classpathentry
path="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar"
kind="var"/>
<classpathentry
path="M2_REPO/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar"
kind="var"/>
<classpathentry
path="M2_REPO/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar"
kind="var"/>
@@ -48,5 +44,10 @@
<classpathentry path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar"
kind="var"/>
<classpathentry
path="CACTUS_TRUNK_MAMOUTH/framework/framework-12-13-14/src/main/java"
kind="src"/>
<classpathentry
path="CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java"
kind="src"/>
+ <classpathentry path="integration/integration-ant/src/main/java"
kind="src"/>
+ <classpathentry path="integration/integration-maven2/src/main/java"
kind="src"/>
+ <classpathentry
path="M2_REPO/org/codehaus/cargo/cargo-maven-plugin/1.0-SNAPSHOT/cargo-maven-plugin-1.0-SNAPSHOT.jar"
kind="var"/>
+ <classpathentry
path="M2_REPO/org/apache/cactus/integration-shared-api/1.18-SNAPSHOT/integration-shared-api-1.18-SNAPSHOT.jar"
kind="var"/>
+ <classpathentry path="integration/integration-maven2/src/main/groovy"
kind="src"/>
<classpathentry path="bin" kind="output"/>
</classpath>
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=608920&r1=608919&r2=608920&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
Fri Jan 4 09:00:25 2008
@@ -40,7 +40,11 @@
<item name="Getting started"
href="getting_started.html"/>
<item name="How it works" href="how_it_works.html"/>
<item name="Writing tests"
href="/writing/howto_testcase.html" />
- <item name="Running tests"
href="/integration/index.html"/>
+ <item name="Running tests"
href="/integration/index.html" collapse="true">
+ <item name="Manual"
href="integration/manual/index.html"/>
+ <item name="Eclipse"
href="integration/eclipse/index.html"/>
+ <item name="Ant"
href="integration/ant/index.html"/>
+ </item>
<item name="Participating"
href="/participating/index.html" collapse="true">
<item name="About Us"
href="/participating/contributors.html" />
<item name="TODO/Open Issues"
href="http://issues.apache.org/jira/browse/CACTUS?report=com.atlassian.jira.plugin.system.project:openissues-panel";
/>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/features.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/features.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/features.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/features.xml
Fri Jan 4 09:00:25 2008
@@ -41,7 +41,7 @@
Support for testing the View layer is done through integration
with <a href="http://httpunit.sourceforge.net/";>HttpUnit</a>.
This is functional unit testing (see the
- <a href="/index.html#unittest_types">What is Cactus</a>
+ <a href="index.html#unittest_types">What is Cactus</a>
page, for a description of the different kinds of unit tests).
</note>
<note>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/getting_started.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/getting_started.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/getting_started.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/getting_started.xml
Fri Jan 4 09:00:25 2008
@@ -93,7 +93,7 @@
<p>
At this point, you should have
- <a href="/downloads.html">downloaded</a> a Cactus distribution
+ <a href="downloads.html">downloaded</a> a Cactus distribution
(for the J2EE API you intend to use) and unzipped it in a
<code>[cactus root]</code> directory.
</p>
@@ -111,7 +111,7 @@
</li>
<li>
<strong><code>samples/</code></strong>: contains
- <a href="/howto_sample.html">sample applications</a>
+ <a href="howto_sample.html">sample applications</a>
showing how to write Cactus tests and how to automate their
execution.
</li>
@@ -131,7 +131,7 @@
<li>
<strong><code>web/</code></strong>: contains the JSP redirector file
which is only required if you're using the
- <a href="/integration/manual/index.html">manual integration</a>.
+ <a href="integration/manual/index.html">manual integration</a>.
</li>
</ul>
@@ -150,7 +150,7 @@
This is only needed if you wish to use Ant for automating the
execution of Cactus tests. For more information on how to integrate
Cactus with Ant, see the
- <a href="/integration/ant/index.html">Ant Howto</a> tutorial. You also
+ <a href="integration/ant/index.html">Ant Howto</a> tutorial. You also
find this jar in <code>[cactus root]/lib</code>.
</li>
<li>
@@ -179,12 +179,12 @@
the Servlet sample. Ideally we should be bundling the J2EE jar (which
is required for compiling the EJB sample). However the Sun license
does not allow us to redistribute it so you'll need to download it
- by yourself (see the <a href="/howto_sample.html">Sample howto</a>
+ by yourself (see the <a href="howto_sample.html">Sample howto</a>
page.
</li>
<li>
<strong><code>httpunit.jar</code></strong>: Cactus uses the
- HttpUnit framework to perform <a
href="/writing/howto_httpunit.html">complex
+ HttpUnit framework to perform <a
href="writing/howto_httpunit.html">complex
assertions of returned responses</a>. Cactus also bundles a default
web response object but the HttpUnit one should be preffered for
complex assertions.
@@ -202,17 +202,17 @@
At this point you should understand what Cactus is and how it works.
</p>
<p>
- Pick the <a href="/integration/index.html">Cactus integration
module</a> that
+ Pick the <a href="integration/index.html">Cactus integration
module</a> that
you wish to use in your development environment. Read up on how it
works
and how to use it.
</p>
<p>
- Then, you should read the <a
href="/writing/howto_testcase.html">TestCase
+ Then, you should read the <a
href="writing/howto_testcase.html">TestCase
Howto</a> to understand how to write Cactus Test Cases.
</p>
<p>
The last step is probably to put in practice what you've learned so far
- by <a href="/howto_sample.html">running the Cactus Samples</a>.
+ by <a href="howto_sample.html">running the Cactus Samples</a>.
</p>
<p>
Enjoy !
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/how_it_works.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/how_it_works.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/how_it_works.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/how_it_works.xml
Fri Jan 4 09:00:25 2008
@@ -185,8 +185,10 @@
<img src="images/archi_servlet.jpg"
alt="Servlet Redirector Architecture"/>
-
- <p>
+
+ <br/>
+
+ <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
@@ -201,7 +203,9 @@
<section title="JSP Redirector Proxy">
<img src="images/archi_jsp.jpg" alt="JSP Redirector Architecture"/>
-
+
+ <br/>
+
<p>
The client side opens 2 HTTP connections to the JSP redirector.
Once to execute the tests and retrieve the servlet output stream
and
@@ -218,6 +222,8 @@
<img src="images/archi_filter.jpg" alt="Filter Redirector
Architecture"/>
+ <br/>
+
<p>
The client side opens 2 HTTP connections to the Filter redirector.
Once to execute the tests and retrieve the servlet output stream
and
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/howto_ant_cactus.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/howto_ant_cactus.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/howto_ant_cactus.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/howto_ant_cactus.xml
Fri Jan 4 09:00:25 2008
@@ -291,7 +291,7 @@
<li>
It contains all the libraries that Cactus needs on the server
side (see the
- <a href="/integration/manual/howto_classpath.html">Classpath
Guide</a> for
+ <a href="howto_classpath.html">Classpath Guide</a> for
details).
</li>
<li>
@@ -370,7 +370,7 @@
the nested <strong><classes></strong> and
<strong><lib></strong> elements in the example above. We do
this to add the actual test classes to the cactified WAR, as well as
- the <a href="/writing/howto_httpunit.html">HttpUnit</a> JAR needed for
+ the <a href="writing/howto_httpunit.html">HttpUnit</a> JAR needed for
some of the tests.
</p>
@@ -386,7 +386,7 @@
you can simply run the tests like normal JUnit tests, and provide
a couple of system properties that tell Cactus how to connect to the
server (see the
- <a href="/integration/manual/howto_config.html">Configuration
Guide</a> for
+ <a href="howto_config.html">Configuration Guide</a> for
details).
</p>
<p>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/index.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/index.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/index.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/index.xml
Fri Jan 4 09:00:25 2008
@@ -111,10 +111,10 @@
<p>
The Ant tasks provided by Cactus are distributed together with the
main distribution of Cactus, which you can get from the
- <a href="/downloads.html">download</a> area. After downloading
+ <a href="downloads.html">download</a> area. After downloading
and expanding the archive, you'll find several JAR files in the
<code>lib</code> directory. See the
- <a href="/integration/manual/howto_classpath.html">Classpath
Guide</a> for
+ <a href="integration/manual/howto_classpath.html">Classpath Guide</a>
for
information about which of the JARs you need for what.
</p>
<p>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/task_cactifyear.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/task_cactifyear.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/task_cactifyear.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/task_cactifyear.xml
Fri Jan 4 09:00:25 2008
@@ -78,7 +78,7 @@
The <strong>cactuswar</strong> element configures everything that
has to do with the cactus web application that will end up in the
ear. This element has all the parameters of the
- <a href="/integration/ant/task_cactifywar.html">cactifywar</a> task
except
+ <a href="integration/ant/task_cactifywar.html">cactifywar</a> task
except
the <strong>destfile</strong> parameter. The web application will
always be named cactus.war and be placed in the root of the ear.
</p>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/task_cactus.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/task_cactus.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/task_cactus.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/task_cactus.xml
Fri Jan 4 09:00:25 2008
@@ -97,7 +97,7 @@
<td>
The web application archive that should be tested. The archive must
already contain everything needed for running Cactus tests (it must
- be <em><a
href="/integration/ant/task_cactifywar.html">cactified</a></em>).
+ be <em><a
href="integration/ant/task_cactifywar.html">cactified</a></em>).
</td>
<td>Yes, unless the <em>earfile</em> attribute is specified</td>
</tr>
@@ -107,7 +107,7 @@
The enterprise application archive that should be tested. The
archive must contain a web module that already contains everything
needed for running Cactus tests (it must be
- <em><link
href="/integration/ant/task_cactifywar.html">cactified</link></em>).
+ <em><link
href="integration/ant/task_cactifywar.html">cactified</link></em>).
</td>
<td>Yes, unless the <em>warfile</em> attribute is specified</td>
</tr>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/task_webxmlmerge.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/task_webxmlmerge.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/task_webxmlmerge.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/ant/task_webxmlmerge.xml
Fri Jan 4 09:00:25 2008
@@ -151,7 +151,7 @@
<p>
The <code>xmlcatalog</code> element can be used to perform Entity and
URI resolution. This is a built-in Ant type. See the
- <a href="ext:ant">Ant documentation</a> for details.
+ <a href="http://ant.apache.org/";>Ant documentation</a> for details.
</p>
<note>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/eclipse/index.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/eclipse/index.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/eclipse/index.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/eclipse/index.xml
Fri Jan 4 09:00:25 2008
@@ -42,11 +42,11 @@
<a href="http://www.eclipse.org/";>Eclipse</a> platform relies on 2
separate plug-ins :
</p>
<li>
- The <a href="/integration/eclipse/runner_plugin.html">Cactus
runner
+ The <a href="integration/eclipse/runner_plugin.html">Cactus
runner
plug-in</a>
</li>
<li>
- The <a href="/integration/eclipse/webapp_plugin.html">Webapp
Eclipse
+ The <a href="integration/eclipse/webapp_plugin.html">Webapp
Eclipse
plug-in</a>
</li>
</section>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/eclipse/webapp_plugin.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/eclipse/webapp_plugin.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/eclipse/webapp_plugin.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/eclipse/webapp_plugin.xml
Fri Jan 4 09:00:25 2008
@@ -90,7 +90,7 @@
<section name="Using">
<p>
This plug-in can only be called by another plug-in. See the
- <a href="/integration/eclipse/runner_plugin.html">Cactus runner
+ <a href="integration/eclipse/runner_plugin.html">Cactus runner
plug-in</a> for a use case.
</p>
</section>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/index.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/index.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/index.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/index.xml
Fri Jan 4 09:00:25 2008
@@ -36,7 +36,7 @@
</p>
<ul>
<li>
- <a href="/integration/manual/index.html">Manually</a>. This
means
+ <a href="manual/index.html">Manually</a>. This means
that you need to deploy your code and tests into your container and
start this container by yourself. Then you can execute the tests
by running a standard JUnit test Runner. For example, you can start
@@ -49,14 +49,14 @@
<code>junit.swingui.TestRunner.main [test case class]</code>
</li>
<li>
- <a href="/integration/howto_ide.html">From an IDE</a> or any tool
+ <a href="howto_ide.html">From an IDE</a> or any tool
providing a JUnit integration plugin.
</li>
<li>
- <a href="/integration/integration_browser.html">From a
browser</a>, by
+ <a href="integration_browser.html">From a browser</a>, by
using the Cactus Servlet Test Runner, which is a special JUnit
Test Runner. Please also check the
- <a href="/integration/howto_tomcat.html">Tomcat quick start
tutorial</a>
+ <a href="howto_tomcat.html">Tomcat quick start tutorial</a>
which is a step by step tutorial describing how to deploy Cactus
tests in Tomcat and how to execute them through a browser.
</li>
@@ -67,7 +67,7 @@
</ul>
</li>
<li>
- Using the Cactus <a href="/integration/ant/index.html">Ant
+ Using the Cactus <a href="ant/index.html">Ant
integration</a>. Cactus provides several custom Ant task to
automate the deployment of Cactus tests
(<code><cactifywar></code>) and the
@@ -82,7 +82,7 @@
automated solution to deploy and execute Cactus tests.
</li>
<li>
- Using the <a href="/integration/maven/index.html">Jetty
+ Using the <a href="maven/index.html">Jetty
integration</a>. Cactus provilinkdes a
<code>JettyTestSetup</code> class that you can directly
use in your Cactus TestCase's <code>suite()</code> method. This
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/manual/howto_classpath.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/manual/howto_classpath.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/manual/howto_classpath.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/manual/howto_classpath.xml
Fri Jan 4 09:00:25 2008
@@ -35,12 +35,12 @@
Test Runner (in the client JVM) and that the Cactus TestCase that you
have extended will connect to the Cactus Redirector (in the server
JVM), where your <code>testXXX()</code> methods will be executed. See
- <a href="/how_it_works.html">How it works</a> to understand the
+ <a href="how_it_works.html">How it works</a> to understand the
mechanism.
</p>
<p>
- Please also check the <a href="/integration/index.html">TestRunner
+ Please also check the <a href="integration/index.html">TestRunner
Howto</a> tutorial which explains all the different ways to
start a JUnit Test Runner.
</p>
@@ -117,7 +117,7 @@
wish to use
<a href="http://httpunit.sourceforge.net";>HttpUnit</a>
in your <code>endXXX()</code> methods (see the
- <a href="/writing/howto_httpunit.html">HttpUnit Howto</a> tutorial).
+ <a href="writing/howto_httpunit.html">HttpUnit Howto</a> tutorial).
The 3 jars mentioned above are part of the HttpUnit distribution.
</li>
<li>
@@ -138,14 +138,14 @@
to put the <strong><code>cactus.properties</code></strong>
configuration file in your classpath (Only if you are using it to
configure Cactus of course). Details are described in the
- <a href="/integration/manual/howto_config.html">Config Howto</a>
tutorial).
+ <a href="integration/manual/howto_config.html">Config Howto</a>
tutorial).
</p>
<note>
If you are using Log4J as the logging framework, you will also
need to put a <code>log4j.properties</code> Log4j configuration
file in your client side classpath (See the
- <a href="/integration/manual/howto_config.html">Config Howto</a>
tutorial).
+ <a href="integration/manual/howto_config.html">Config Howto</a>
tutorial).
</note>
</section>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/manual/howto_config.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/manual/howto_config.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/manual/howto_config.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/manual/howto_config.xml
Fri Jan 4 09:00:25 2008
@@ -41,13 +41,13 @@
</p>
<ul>
<li>
- <a
href="/integration/manual/howto_config.html#clientside">Client side
configuration</a>
+ <a
href="integration/manual/howto_config.html#clientside">Client side
configuration</a>
</li>
<li>
- <a
href="/integration/manual/howto_config.html#serverside">Server side
configuration</a>
+ <a
href="integration/manual/howto_config.html#serverside">Server side
configuration</a>
</li>
<li>
- <a href="/integration/manual/howto_config.html#logging">Cactus
logging configuration</a>
+ <a href="integration/manual/howto_config.html#logging">Cactus
logging configuration</a>
</li>
</ul>
@@ -140,7 +140,7 @@
server side in <code>web.xml</code> (see below). This property
is needed only if your test classes are extending
<code>ServletTestCase</code> (see the
- <a href="/writing/howto_testcase.html">TestCase Howto</a>
+ <a href="writing/howto_testcase.html">TestCase Howto</a>
tutorial).
</td>
</tr>
@@ -176,7 +176,7 @@
server side in <code>web.xml</code> (see below). This property
is needed only if your test classes are extending
<code>JspTestCase</code> (see the
- <a href="/writing/howto_testcase.html">TestCase Howto</a>
+ <a href="writing/howto_testcase.html">TestCase Howto</a>
tutorial).
</td>
</tr>
@@ -212,7 +212,7 @@
server side in <code>web.xml</code> (see below). This property
is needed only if your test classes are extending
<code>FilterTestCase</code> (see the
- <a href="/writing/howto_testcase.html">TestCase Howto</a>
+ <a href="writing/howto_testcase.html">TestCase Howto</a>
tutorial).
</td>
</tr>
@@ -232,7 +232,7 @@
<p>
On Cactus server side, you only need to properly configure your
application <code>web.xml</code> file to include definitions for
- Cactus Redirectors (see <a href="/how_it_works.html">How it
+ Cactus Redirectors (see <a href="how_it_works.html">How it
works</a> if you don't know what a Cactus Redirector is).
</p>
@@ -339,7 +339,7 @@
<p>
Last, if you need to unit test code that uses the Servlet
Security API, please check the
- <a href="/writing/howto_security.html">Security Howto</a>.
+ <a href="writing/howto_security.html">Security Howto</a>.
</p>
</section>
@@ -381,7 +381,7 @@
<note>
If you're using the Ant <code><cactus></code> task, please
- refer to the <a
href="/integration/ant/task_cactus.html">documentation for that
+ refer to the <a
href="integration/ant/task_cactus.html">documentation for that
task</a> to set up Cactus logging.
</note>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/manual/index.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/manual/index.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/manual/index.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/integration/manual/index.xml
Fri Jan 4 09:00:25 2008
@@ -41,10 +41,10 @@
</p>
<ul>
<li>
- <a href="/integration/manual/howto_config.html">How to
configure Cactus</a>
+ <a href="integration/manual/howto_config.html">How to configure
Cactus</a>
</li>
<li>
- <a href="/integration/manual/howto_classpath.html">How to set
up the Cactus classpath</a>
+ <a href="integration/manual/howto_classpath.html">How to set up
the Cactus classpath</a>
</li>
</ul>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/pom.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/pom.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/pom.xml
Fri Jan 4 09:00:25 2008
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2-SNAPSHOT</version>
+ <version>2.2-beta-1</version>
<configuration>
<descriptor>src/assemble/main.xml</descriptor>
</configuration>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/pom.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/pom.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/pom.xml
Fri Jan 4 09:00:25 2008
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2-SNAPSHOT</version>
+ <version>2.2-beta-1</version>
<configuration>
<descriptor>src/assemble/main.xml</descriptor>
</configuration>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
Fri Jan 4 09:00:25 2008
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2-SNAPSHOT</version>
+ <version>2.2-beta-1</version>
<configuration>
<descriptor>src/assemble/main.xml</descriptor>
</configuration>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
Fri Jan 4 09:00:25 2008
@@ -40,7 +40,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2-SNAPSHOT</version>
+ <version>2.2-beta-1</version>
<configuration>
<descriptor>src/assemble/main.xml</descriptor>
</configuration>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java/org/apache/cactus/integration/ant/CactifyWarTask.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java/org/apache/cactus/integration/ant/CactifyWarTask.java?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java/org/apache/cactus/integration/ant/CactifyWarTask.java
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java/org/apache/cactus/integration/ant/CactifyWarTask.java
Fri Jan 4 09:00:25 2008
@@ -22,9 +22,11 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Random;
import javax.xml.parsers.ParserConfigurationException;
@@ -61,7 +63,11 @@
{
// Constants
---------------------------------------------------------------
-
+
+ //get some non-crypto-grade randomness from various places.
+ private static Random rand = new Random(System.currentTimeMillis()
+ + Runtime.getRuntime().freeMemory());
+
/**
* The name of the Cactus filter redirector class.
*/
@@ -471,18 +477,21 @@
// Serialize the cactified deployment descriptor into a temporary file,
// so that it can get picked up by the War task
- FileUtils fileUtils = FileUtils.newFileUtils();
- File tmpDir = fileUtils.createTempFile("cactus", "tmp.dir",
- getProject().getBaseDir());
+ //FileUtils fileUtils = FileUtils.newFileUtils();
+ File tmpDir = createTempFile("cactus", "tmp.dir",
+ getProject().getBaseDir(), true);
tmpDir.mkdirs();
- tmpDir.deleteOnExit();
+ //tmpDir.deleteOnExit();
File webXmlFile = null;
try
{
ZipFileSet fileSet = new ZipFileSet();
fileSet.setDir(tmpDir);
+ tmpDir.mkdir();
File[] files = WebXmlIo.writeAll(theWebXml,
tmpDir.getAbsolutePath());
+
+
for (int i = 0; i < files.length; i++)
{
File f = files[i];
@@ -553,4 +562,25 @@
theWebXml.addEjbRef(ref);
}
}
+
+ public File createTempFile(String prefix, String suffix, File parentDir,
+ boolean deleteOnExit) {
+ File result = null;
+ String parent = (parentDir == null)
+ ? System.getProperty("java.io.tmpdir")
+ : parentDir.getPath();
+
+ DecimalFormat fmt = new DecimalFormat("#####");
+ synchronized (rand) {
+ do {
+ result = new File(parent,
+ prefix +
fmt.format(Math.abs(rand.nextInt()))
+ + suffix);
+ } while (result.exists());
+ }
+ if (deleteOnExit) {
+ result.deleteOnExit();
+ }
+ return result;
+ }
}
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java
Fri Jan 4 09:00:25 2008
@@ -21,6 +21,7 @@
package org.apache.cactus.integration.ant;
import java.io.File;
+import java.lang.reflect.Field;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
@@ -403,6 +404,7 @@
String servletRedirectorMapping =
theFile.getServletRedirectorMapping();
+
if (servletRedirectorMapping != null)
{
addCactusClientProperty("cactus.servletRedirectorName",
@@ -446,6 +448,7 @@
if (test.shouldRun(getProject())
&& !theWrapper.isExcluded(test.getName()))
{
+ test.setFork(true);
if (theWrapper.getToDir() != null)
{
test.setTodir(theWrapper.getToDir());
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java
Fri Jan 4 09:00:25 2008
@@ -120,14 +120,17 @@
"org.apache.cactus.server.ServletTestRedirector");
if (servletNames.hasNext())
{
- // we only care about the first definition and the first mapping
- String name = (String) servletNames.next();
- Iterator mappings = theWar.getWebXml().getServletMappings(name);
- if (mappings.hasNext())
- {
- return (String) mappings.next();
+ // we iterate over all of the servlet names but return the first
met only --//TODO to be fixed
+ while(servletNames.hasNext()) {
+ String name = (String) servletNames.next();
+ Iterator mappings =
theWar.getWebXml().getServletMappings(name);
+ if (mappings.hasNext())
+ {
+ return (String) mappings.next();
+ }
}
- }
+ }
+ System.out.println("Could not find servlet redirs");
return null;
}
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/pom.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/pom.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/pom.xml
Fri Jan 4 09:00:25 2008
@@ -131,17 +131,49 @@
<artifactId>ant</artifactId>
<version>1.6.5</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-script-ant</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+
</dependencies>
+
<build>
<plugins>
<plugin>
+ <!-- NOTE: We don't need groupId if the plugin's groupId is
+ org.apache.maven.plugins OR org.codehaus.mojo.
+ We also don't have to specify a version, since Maven can
+ automatically resolve the newest one.
+ -->
<artifactId>maven-plugin-plugin</artifactId>
+
+ <!-- Add the Ant plugin tools -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-tools-ant</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cactus</groupId>
+ <artifactId>integration-ant</artifactId>
+ <version>1.18-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- Tell the plugin-plugin which prefix we will use.
+ Later, we'll configure Maven to allow us to invoke this
+ plugin using the "prefix:mojo" shorthand.
+ -->
+
<configuration>
- <!-- Note: This is to allow typing "mvn cactus:[goalname]" without
having to type the
- fully qualified name on the command line -->
<goalPrefix>cactus</goalPrefix>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
</project>
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml Fri Jan 4 09:00:25
2008
@@ -182,10 +182,10 @@
<system>continuum</system>
<notifiers>
<notifier>
- <type>mail</type>
- <configuration>
- <address>[EMAIL
PROTECTED]</address>
- </configuration>
+ <type>mail</type>
+ <configuration>
+ <address>[EMAIL
PROTECTED]</address>
+ </configuration>
</notifier>
</notifiers>
</ciManagement>
@@ -234,11 +234,15 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
-
<tagBase>http://svn.apache.org/repos/asf/jakarta/cactus/tags</tagBase>
- </configuration>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-release-plugin</artifactId>
+ <configuration>
+
<tagBase>http://svn.apache.org/repos/asf/jakarta/cactus/tags</tagBase>
+ </configuration>
+ </plugin>
+ <plugin>
+
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
</plugin>
</plugins>
</pluginManagement>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/pom.xml?rev=608920&r1=608919&r2=608920&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/pom.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/pom.xml
Fri Jan 4 09:00:25 2008
@@ -27,13 +27,95 @@
<artifactId>samples-servlet</artifactId>
<name>Cactus Servlet Samples - Parent Project</name>
<description>Cactus Servlet Sample Projects</description>
- <packaging>pom</packaging>
+ <packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cactus</groupId>
+ <artifactId>javaEE-14-uberjar</artifactId>
+ <version>1.18-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
- <modules>
- <module>samples-servlet-share</module>
- <module>samples-servlet-javaEE-12</module>
- <module>samples-servlet-javaEE-13</module>
- </modules>
+ </dependencies>
+ <properties>
+ <container.id>tomcat5x</container.id>
+
<container.home>/home/peter/bin/apache/jakarta-tomcat-5.0.28/</container.home>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.apache.cactus.integration.m2</groupId>
+ <artifactId>cactus-m2-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+
<artifactId>ant-junit</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+
<groupId>org.apache.cactus</groupId>
+
<artifactId>javaEE-14-uberjar</artifactId>
+ <version>1.18-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+
<groupId>org.apache.cactus</groupId>
+
<artifactId>integration-ant</artifactId>
+ <version>1.18-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+
<artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+
<artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+
<artifactId>httpunit</artifactId>
+ <version>1.6</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
