vmassol 2004/01/11 08:48:34
Modified: integration/maven plugin.properties plugin.jelly
integration/maven/xdocs changes.xml properties.xml
Log:
<action dev="vmassol" type="add" issue="24754" 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>
Revision Changes Path
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.properties 5 Jan 2004 20:41:52 -0000 1.8
+++ plugin.properties 11 Jan 2004 16:48:33 -0000 1.9
@@ -53,6 +53,12 @@
# speed, you can turn this off.
cactus.execute.during.report = true
+# Goal that Cactus should call for generating the war artifact
+cactus.build.goal.war = war:war
+
+# Goal that Cactus should call for generating the ejb artifact
+cactus.build.goal.ejb = ejb:ejb
+
# J2EE version for the generated appxml descriptor (needed only when testing
# EJBs with Cactus)
cactus.j2ee.version = 1.3
1.12 +8 -2 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin.jelly 5 Jan 2004 20:41:52 -0000 1.11
+++ plugin.jelly 11 Jan 2004 16:48:34 -0000 1.12
@@ -34,7 +34,7 @@
Initializations.
========================================================================
-->
- <goal name="cactus:init" prereqs="war:war">
+ <goal name="cactus:init">
<ant:path id="cactus.classpath">
<ant:pathelement location="${plugin.getDependencyPath('cactus:cactus-ant')}"/>
@@ -223,6 +223,9 @@
<goal name="cactus:cactifywar" prereqs="cactus:compile"
description="Cactify the application war">
+ <!-- Generate the war artifact -->
+ <attainGoal name="${cactus.build.goal.war}"/>
+
<cactifywar srcfile="${cactus.src.war}" destfile="${cactus.war}">
<!-- Add the mergewebxml attribute if it has been defined by the
@@ -746,8 +749,11 @@
========================================================================
-->
<goal name="cactus:cactifyear"
- prereqs="ejb:ejb,cactus:cactifywar,cactus:generate-ear-descriptor"
+ prereqs="cactus:cactifywar,cactus:generate-ear-descriptor"
description="Create and cactify an EAR">
+
+ <!-- Generate the ejb artifact -->
+ <attainGoal name="${cactus.build.goal.ejb}"/>
<ant:mkdir dir="${maven.build.dir}"/>
1.14 +6 -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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- changes.xml 5 Jan 2004 20:41:52 -0000 1.13
+++ changes.xml 11 Jan 2004 16:48:34 -0000 1.14
@@ -8,6 +8,12 @@
<body>
<release version="1.6dev" date="in CVS">
+ <action dev="vmassol" type="add" issue="24754" 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
1.12 +20 -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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- properties.xml 5 Jan 2004 20:41:52 -0000 1.11
+++ properties.xml 11 Jan 2004 16:48:34 -0000 1.12
@@ -180,6 +180,26 @@
</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>
</table>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
