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/14 02:36:17 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/cactus plugin.jelly
dion 2003/01/13 17:36:17
Modified: src/plugins-build/cactus plugin.jelly
Log:
Fix use of id where artifactId should have been used
Revision Changes Path
1.24 +14 -14 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- plugin.jelly 30 Nov 2002 00:27:28 -0000 1.23
+++ plugin.jelly 14 Jan 2003 01:36:17 -0000 1.24
@@ -90,7 +90,7 @@
-->
<goal name="cactus:webapp" description="Create the Cactus webapp">
- <available file="${maven.cactus.prewar.dir}/${pom.id}.war"
+ <available file="${maven.cactus.prewar.dir}/${pom.artifactId}.war"
property="maven.cactus.prewar.exists"/>
<j:choose>
@@ -98,22 +98,22 @@
<j:when test="${maven.cactus.prewar.exists}">
<!-- Expand the project war -->
- <unwar src="${maven.cactus.prewar.dir}/${pom.id}.war"
- dest="${maven.cactus.build.dir}/${pom.id}"/>
+ <unwar src="${maven.cactus.prewar.dir}/${pom.artifactId}.war"
+ dest="${maven.cactus.build.dir}/${pom.artifactId}"/>
<attainGoal name="cactus:webapp-update"/>
</j:when>
<j:otherwise>
- <available file="${maven.cactus.prewar.dir}/${pom.id}/WEB-INF"
+ <available file="${maven.cactus.prewar.dir}/${pom.artifactId}/WEB-INF"
type="dir" property="maven.cactus.prewebapp.exists"/>
<j:choose>
<j:when test="${maven.cactus.prewebapp.exists}">
- <copy todir="${maven.cactus.build.dir}/${pom.id}">
- <fileset dir="${maven.cactus.prewar.dir}/${pom.id}"/>
+ <copy todir="${maven.cactus.build.dir}/${pom.artifactId}">
+ <fileset dir="${maven.cactus.prewar.dir}/${pom.artifactId}"/>
</copy>
<attainGoal name="cactus:webapp-update"/>
@@ -157,7 +157,7 @@
style="${maven.cactus.webxml.dvsl}"
toolboxFile="${plugin.dir}/toolbox.props"
in="${webxml}"
- out="${maven.cactus.build.dir}/${pom.id}/WEB-INF/web.xml">
+ out="${maven.cactus.build.dir}/${pom.artifactId}/WEB-INF/web.xml">
</dvsl:dvsl>
</goal>
@@ -171,7 +171,7 @@
description="Generate an expanded Cactus webapp from a project expanded webapp">
<!-- Copy Cactus configuration files -->
- <copy todir="${maven.cactus.build.dir}/${pom.id}"
+ <copy todir="${maven.cactus.build.dir}/${pom.artifactId}"
file="${maven.cactus.jspRedirector}"/>
<!-- Create the web.xml which is result of merging the project web.xml
@@ -179,19 +179,19 @@
<attainGoal name="cactus:merge-webxml"/>
<!-- Copy Cactus jars -->
- <copy todir="${maven.cactus.build.dir}/${pom.id}/WEB-INF/lib"
+ <copy todir="${maven.cactus.build.dir}/${pom.artifactId}/WEB-INF/lib"
file="${plugin.getDependencyPath('cactus:cactus')}"/>
- <copy todir="${maven.cactus.build.dir}/${pom.id}/WEB-INF/lib"
+ <copy todir="${maven.cactus.build.dir}/${pom.artifactId}/WEB-INF/lib"
file="${plugin.getDependencyPath('aspectj:aspectjrt')}"/>
- <copy todir="${maven.cactus.build.dir}/${pom.id}/WEB-INF/lib"
+ <copy todir="${maven.cactus.build.dir}/${pom.artifactId}/WEB-INF/lib"
file="${plugin.getDependencyPath('commons-logging')}"/>
- <copy todir="${maven.cactus.build.dir}/${pom.id}/WEB-INF/lib"
+ <copy todir="${maven.cactus.build.dir}/${pom.artifactId}/WEB-INF/lib"
file="${plugin.getDependencyPath('junit')}"/>
- <copy todir="${maven.cactus.build.dir}/${pom.id}/WEB-INF/lib"
+ <copy todir="${maven.cactus.build.dir}/${pom.artifactId}/WEB-INF/lib"
file="${plugin.getDependencyPath('httpunit')}"/>
<!-- Copy Cactus tests -->
- <copy todir="${maven.cactus.build.dir}/${pom.id}/WEB-INF/classes">
+ <copy todir="${maven.cactus.build.dir}/${pom.artifactId}/WEB-INF/classes">
<fileset dir="${maven.cactus.classes.dir}"/>
</copy>