vmassol 2004/01/05 12:41:52
Modified: integration/maven plugin.properties plugin.jelly
integration/maven/xdocs changes.xml properties.xml
Log:
<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>
Revision Changes Path
1.8 +6 -0 jakarta-cactus/integration/maven/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.properties 31 Dec 2003 09:35:02 -0000 1.7
+++ plugin.properties 5 Jan 2004 20:41:52 -0000 1.8
@@ -60,6 +60,12 @@
# (optional) Temporary directory where the containers are setup/executed
#cactus.tmp.dir =
+# 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 application.xml if the WAR is packaged
+# in an EAR, etc).
+cactus.war = ${maven.build.dir}/${pom.artifactId}-cactus.war
+
# -------------------------------------------------------------------
# Container-related properties
# -------------------------------------------------------------------
1.11 +27 -22 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 31 Dec 2003 09:35:02 -0000 1.10
+++ plugin.jelly 5 Jan 2004 20:41:52 -0000 1.11
@@ -76,8 +76,11 @@
<ant:path refid="cactus.classpath"/>
</ant:path>
- <j:set var="cactus.war" value="${pom.artifactId}-cactus.war"/>
- <j:set var="cactus.ear" value="${pom.artifactId}-cactus.ear"/>
+ <ant:dirname property="cactus.war.dir" file="${cactus.war}"/>
+ <ant:basename property="cactus.war.name" file="${cactus.war}"/>
+
+ <j:set var="cactus.ear"
+ value="${maven.build.dir}/${pom.artifactId}-cactus.ear"/>
</goal>
@@ -220,8 +223,7 @@
<goal name="cactus:cactifywar" prereqs="cactus:compile"
description="Cactify the application war">
- <cactifywar srcfile="${cactus.src.war}"
- destfile="${maven.build.dir}/${cactus.war}">
+ <cactifywar srcfile="${cactus.src.war}" destfile="${cactus.war}">
<!-- Add the mergewebxml attribute if it has been defined by the
user -->
@@ -280,8 +282,8 @@
</fileset>
</cactus:scanner>
- <cactus warfile="${maven.build.dir}/${cactus.war}"
- fork="yes" errorproperty="cactustests.error"
+ <cactus warfile="${cactus.war}" fork="yes"
+ errorproperty="cactustests.error"
failureproperty="cactustests.failure"
printsummary="${cactus.printsummary}">
@@ -479,10 +481,10 @@
</j:when>
<j:otherwise>
- <cactus warfile="${maven.build.dir}/${cactus.war}"
- fork="yes" errorproperty="cactustests.error"
- failureproperty="cactustests.failure"
- printsummary="${cactus.printsummary}">
+ <cactus warfile="${cactus.war}" fork="yes"
+ errorproperty="cactustests.error"
+ failureproperty="cactustests.failure"
+ printsummary="${cactus.printsummary}">
<ant:classpath>
<ant:pathelement path="${maven.build.dest}"/>
<ant:pathelement location="${cactus.target.classes.dir}"/>
@@ -616,10 +618,10 @@
</j:when>
<j:otherwise>
- <cactus warfile="${maven.build.dir}/${cactus.war}"
- fork="yes" errorproperty="cactustests.error"
- failureproperty="cactustests.failure"
- printsummary="${cactus.printsummary}">
+ <cactus warfile="${cactus.war}" fork="yes"
+ errorproperty="cactustests.error"
+ failureproperty="cactustests.failure"
+ printsummary="${cactus.printsummary}">
<ant:classpath>
<ant:pathelement path="${maven.build.dest}"/>
<ant:pathelement location="${cactus.target.classes.dir}"/>
@@ -749,13 +751,15 @@
<ant:mkdir dir="${maven.build.dir}"/>
- <ant:ear destfile="${maven.build.dir}/${cactus.ear}"
+ <ant:ear destfile="${cactus.ear}"
appxml="${maven.build.dir}/application.xml">
<!-- include cactus generated archives -->
- <ant:fileset dir="${maven.build.dir}">
- <ant:include name="${cactus.war}"/>
- <ant:include name="${cactus.ejb}"/>
+ <ant:fileset dir="${cactus.war.dir}">
+ <ant:include name="${cactus.war.name}"/>
+ </ant:fileset>
+ <ant:fileset dir="${cactus.ejb.dir}">
+ <ant:include name="${cactus.ejb.name}"/>
</ant:fileset>
<!-- include marked dependencies -->
@@ -799,7 +803,7 @@
prereqs="cactus:init,cactus:init-report,cactus:cactifyear"
description="Run all Cactus Test Cases (packaged in an EAR)">
- <cactus earfile="${maven.build.dir}/${cactus.ear}" fork="yes"
+ <cactus earfile="${cactus.ear}" fork="yes"
errorproperty="cactustests.error" failureproperty="cactustests.failure"
printsummary="${maven.cactus.printsummary}">
<ant:classpath>
@@ -984,7 +988,8 @@
-->
<goal name="cactus:generate-ear-descriptor" prereqs="cactus:init">
- <j:set var="cactus.ejb" value="${maven.final.name}.jar"/>
+ <j:set var="cactus.ejb.dir" value="${maven.build.dir}"/>
+ <j:set var="cactus.ejb.name" value="${maven.final.name}.jar"/>
<mkdir dir="${maven.build.dir}"/>
@@ -1012,14 +1017,14 @@
<!-- cactus war file -->
<x:element name="module">
<x:element name="web">
- <x:element name="web-uri">${cactus.war}</x:element>
+ <x:element name="web-uri">${cactus.war.name}</x:element>
<x:element name="context-root">${pom.artifactId}</x:element>
</x:element>
</x:element>
<!-- ejb module under test -->
<x:element name="module">
- <x:element name="ejb">${cactus.ejb}</x:element>
+ <x:element name="ejb">${cactus.ejb.name}</x:element>
</x:element>
<j:forEach var="lib" items="${pom.artifacts}">
1.13 +9 -0 jakarta-cactus/integration/maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/changes.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- changes.xml 31 Dec 2003 09:35:02 -0000 1.12
+++ changes.xml 5 Jan 2004 20:41:52 -0000 1.13
@@ -8,6 +8,15 @@
<body>
<release version="1.6dev" date="in CVS">
+ <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><weblogic7x></code> element of the
1.11 +14 -0 jakarta-cactus/integration/maven/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/properties.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- properties.xml 31 Dec 2003 09:35:02 -0000 1.10
+++ properties.xml 5 Jan 2004 20:41:52 -0000 1.11
@@ -166,6 +166,20 @@
</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>
</table>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
