You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/01/28 04:26:26 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/cactus plugin.jelly plugin.properties
dion 2003/01/27 19:26:26
Modified: src/plugins-build/cactus plugin.jelly plugin.properties
Log:
Fix up usage of properties from other plugins
Revision Changes Path
1.2 +5 -2 jakarta-turbine-maven/src/plugins-build/cactus/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/cactus/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 24 Jan 2003 03:44:39 -0000 1.1
+++ plugin.jelly 28 Jan 2003 03:26:26 -0000 1.2
@@ -140,12 +140,15 @@
<goal name="cactus:merge-webxml" prereqs="init-dvsl-tag"
description="Generate a web.xml which is the merge betweem the user project web.xml and the webapp elements needed by Cactus">
- <available file="${maven.war.webxml}"
+ <j:set var="warWebXml"
+ value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.webxml')}"/>
+
+ <available file="${warWebXml}"
property="maven.cactus.webxml.exists"/>
<j:choose>
<j:when test="${maven.cactus.webxml.exists}">
- <j:set var="webxml" value="${maven.war.webxml}"/>
+ <j:set var="webxml" value="${warWebXml}"/>
</j:when>
<j:otherwise>
<j:set var="webxml" value="${maven.cactus.emptywebxml}"/>
1.2 +5 -0 jakarta-turbine-maven/src/plugins-build/cactus/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/cactus/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.properties 24 Jan 2003 03:44:39 -0000 1.1
+++ plugin.properties 28 Jan 2003 03:26:26 -0000 1.2
@@ -56,6 +56,11 @@
# Location where the project war/webapp is located (either as a war or an
# expanded webapp). Cactus will then add its own stuff to the war/webapp.
+#
+# -- FIXME ---------------------------------------------
+# -- This style of property defaulting no longer works +
+# ------------------------------------------------------
+#
maven.cactus.prewar.dir = ${maven.war.build.dir}
# Define what TestRunner to use. Default is the JUnit text test runner