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/09/24 07:21:45 UTC
cvs commit: maven/src/plugins-build/war plugin.jelly
dion 2003/09/23 22:21:45
Modified: src/plugins-build/war/xdocs changes.xml
src/plugins-build/war plugin.jelly
Log:
Apply MAVEN-831
Revision Changes Path
1.13 +4 -0 maven/src/plugins-build/war/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/changes.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- changes.xml 23 Sep 2003 14:46:52 -0000 1.12
+++ changes.xml 24 Sep 2003 05:21:45 -0000 1.13
@@ -8,6 +8,10 @@
<body>
<release version="1.4" date="in CVS">
+ <action dev="dion" type="update">
+ Apply MAVEN-831.
+ Copy web.xml as specified by ${maven.war.webxml}
+ </action>
<action dev="dion" type="update">Add test project</action>
<action dev="evenisse" type="add">
Added maven.war.index property.
1.29 +4 -1 maven/src/plugins-build/war/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/war/plugin.jelly,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- plugin.jelly 3 Sep 2003 09:23:55 -0000 1.28
+++ plugin.jelly 24 Sep 2003 05:21:45 -0000 1.29
@@ -99,7 +99,10 @@
</ant:copy>
</j:if>
-
+ <ant:copy file="${maven.war.webxml}"
+ tofile="${webapp.build.webinf}/web.xml"
+ overwrite="true" />
+
<j:forEach var="lib" items="${pom.artifacts}">
<j:set var="dep" value="${lib.dependency}"/>
<j:if test="${dep.getProperty('war.bundle')=='true'}">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org