vmassol 2004/01/14 10:56:32
Modified: integration/maven plugin.properties project.xml plugin.jelly
project.properties
integration/maven/xdocs properties.xml
Log:
- Fixed bugs that were introduced during tha addition of the cactus.build.goal.war
and cactus.build.goal.ejb properties
- Added new cactus.src.war property to specify where the original non-cactified war
is generated by ${cactus.build.goal.war} goal.
- Remove version property as anyway Maven plugins need fixed versions. It may have
worked but it doesn't yield the benefit I initially thought, i.e. the ability to
override the version in a build.properties file (this doesn't work)
Revision Changes Path
1.10 +3 -0 jakarta-cactus/integration/maven/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.properties 11 Jan 2004 16:48:33 -0000 1.9
+++ plugin.properties 14 Jan 2004 18:56:32 -0000 1.10
@@ -56,6 +56,9 @@
# Goal that Cactus should call for generating the war artifact
cactus.build.goal.war = war:war
+# Default location of war to cactify
+cactus.src.war = ${maven.build.dir}/${pom.artifactId}.war
+
# Goal that Cactus should call for generating the ejb artifact
cactus.build.goal.ejb = ejb:ejb
1.7 +1 -1 jakarta-cactus/integration/maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 5 Dec 2003 14:35:16 -0000 1.6
+++ project.xml 14 Jan 2004 18:56:32 -0000 1.7
@@ -7,7 +7,7 @@
<!-- Note: Although we inherit from default-project.xml, we still cannot
remove the <currentVersion> tag as this project.xml is parsed at
runtime whenever our plugin is called. -->
- <currentVersion>${cactus.plugin.version}</currentVersion>
+ <currentVersion>1.6dev</currentVersion>
<name>Maven Cactus plugin</name>
<package>org.apache.cactus.integration.maven</package>
1.13 +5 -6 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 11 Jan 2004 16:48:34 -0000 1.12
+++ plugin.jelly 14 Jan 2004 18:56:32 -0000 1.13
@@ -19,6 +19,7 @@
xmlns:ant="jelly:ant"
xmlns:define="jelly:define"
xmlns:x="jelly:xml"
+ xmlns:test="test"
xmlns:cactus="jelly:org.apache.cactus.integration.maven.CactusTagLibrary">
<!--
@@ -36,6 +37,9 @@
-->
<goal name="cactus:init">
+ <!-- Not sure why but this is needed, otherwise the taskdefs below fail -->
+ <test:dependency-handle/>
+
<ant:path id="cactus.classpath">
<ant:pathelement location="${plugin.getDependencyPath('cactus:cactus-ant')}"/>
<ant:pathelement location="${plugin.getDependencyPath('cactus:cactus')}"/>
@@ -58,11 +62,6 @@
<ant:property name="cactus.target.classes.dir"
value="${maven.build.dir}/test-cactus-classes"/>
- <j:set var="warBuildDir"
-
value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.build.dir')}"/>
- <ant:property name="cactus.src.war"
- value="${warBuildDir}/${maven.war.final.name}"/>
-
<util:available file="${cactus.src.dir}">
<j:set var="cactusSourcePresent" value="true"/>
</util:available>
@@ -123,7 +122,7 @@
Compiles the Cactus tests.
========================================================================
-->
- <goal name="cactus:compile" prereqs="cactus:init"
+ <goal name="cactus:compile" prereqs="cactus:init,java:compile"
description="Compiles the cactus tests">
<ant:mkdir dir="${cactus.target.classes.dir}"/>
1.5 +1 -5 jakarta-cactus/integration/maven/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/project.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.properties 16 Nov 2003 18:16:59 -0000 1.4
+++ project.properties 14 Jan 2004 18:56:32 -0000 1.5
@@ -6,10 +6,6 @@
# $Id$
# -----------------------------------------------------------------------------
-# Plugin version. This property is externalized from project.xml so that it can
-# be overriden by the build process.
-cactus.plugin.version = 1.6dev
-
# Checkstyle config to use
maven.checkstyle.properties = ${basedir}/../../checkstyle.xml
1.13 +10 -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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- properties.xml 11 Jan 2004 16:48:34 -0000 1.12
+++ properties.xml 14 Jan 2004 18:56:32 -0000 1.13
@@ -171,6 +171,16 @@
<td>Yes</td>
<td>
<p>
+ Location of war to cactify. Defaults to
+ <code>${maven.build.dir}/${pom.artifactId}.war</code>.
+ </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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
