vmassol 2003/11/07 07:17:02
Modified: integration/maven/xdocs changes.xml
integration/maven plugin.jelly
Log:
Fixed bug <a
href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24447";>24447</a>. The plugin
now correctly uses the <code>${maven.war.final.name}</code> property instead of
hard-coding the war name to <code>${pom.artifactId}.war</code>.
Revision Changes Path
1.4 +7 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 30 Oct 2003 18:37:18 -0000 1.3
+++ changes.xml 7 Nov 2003 15:17:01 -0000 1.4
@@ -10,6 +10,13 @@
<release version="1.6dev" date="in CVS">
<action dev="vmassol" type="fix">
Fixed bug
+ <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24447";>24447</a>.
+ The plugin now correctly uses the <code>${maven.war.final.name}</code>
+ property instead of hard-coding the war name to
+ <code>${pom.artifactId}.war</code>.
+ </action>
+ <action dev="vmassol" type="fix">
+ Fixed bug
<a
href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-977";>MAVEN-977</a>.
Cactus <code>cactus.src.includes</code> and
<code>cactus.src.excludes</code> properties should now work.
1.4 +1 -1 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 30 Oct 2003 18:37:18 -0000 1.3
+++ plugin.jelly 7 Nov 2003 15:17:02 -0000 1.4
@@ -59,7 +59,7 @@
<j:set var="warBuildDir"
value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.build.dir')}"/>
<ant:property name="cactus.src.war"
- value="${warBuildDir}/${pom.artifactId}.war"/>
+ value="${warBuildDir}/${maven.war.final.name}"/>
<util:available file="${cactus.src.dir}">
<j:set var="cactusSourcePresent" value="true"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
