You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sn...@apache.org on 2006/04/23 21:20:00 UTC
svn commit: r396307 - in /maven/maven-1/plugins/trunk/war: plugin.jelly
xdocs/changes.xml
Author: snicoll
Date: Sun Apr 23 12:19:58 2006
New Revision: 396307
URL: http://svn.apache.org/viewcvs?rev=396307&view=rev
Log:
MPWAR-46: Now filtering when copying resources
Modified:
maven/maven-1/plugins/trunk/war/plugin.jelly
maven/maven-1/plugins/trunk/war/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/war/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/war/plugin.jelly?rev=396307&r1=396306&r2=396307&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/war/plugin.jelly Sun Apr 23 12:19:58 2006
@@ -111,7 +111,8 @@
<ant:mkdir dir="${webapp.build.webinf}"/>
<j:if test="${webSourcesPresent == 'true'}">
- <ant:copy todir="${maven.war.webapp.dir}" preservelastmodified="true">
+ <ant:copy todir="${maven.war.webapp.dir}" filtering="on"
+ preservelastmodified="true">
<ant:fileset dir="${maven.war.src}"
includes="${maven.war.src.includes}"
excludes="${maven.war.src.excludes}">
@@ -122,6 +123,7 @@
<util:available file="${maven.war.webxml}">
<ant:copy file="${maven.war.webxml}"
tofile="${webapp.build.webinf}/web.xml"
+ filtering="on"
overwrite="${maven.war.webxml.overwrite}" />
</util:available>
Modified: maven/maven-1/plugins/trunk/war/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/war/xdocs/changes.xml?rev=396307&r1=396306&r2=396307&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/war/xdocs/changes.xml Sun Apr 23 12:19:58 2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.6.2-SNAPSHOT" date="in SVN">
+ <action dev="snicoll" type="fix" issue="MPWAR-46">Now filtering when copying resources.</action>
<action dev="snicoll" type="fix" issue="MPWAR-52">Added property <code>maven.war.webxml.overwrite</code> to control if the source web.xml overwrite the one in the generated webapp directory.</action>
<action dev="snicoll" type="fix" issue="MPWAR-29">Fixed confusing documentation regarding maven.war.classes.includes and excludes properties</action>
<action dev="snicoll" type="fix" issue="MPWAR-32">License file is now added properly to the generated war</action>