From b2b8b7030715e4f9bfad2381ae0dc9c0f4a53dad Mon Sep 17 00:00:00 2001
From: snicoll <snicoll@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 23 Apr 2006 19:19:58 +0000
Subject: [PATCH] MPWAR-46: Now filtering when copying resources

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@396307 13f79535-47bb-0310-9956-ffa450edef68
---
 war/plugin.jelly      | 4 +++-
 war/xdocs/changes.xml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/war/plugin.jelly b/war/plugin.jelly
index 8a685bc7..a35cb830 100644
--- a/war/plugin.jelly
+++ b/war/plugin.jelly
@@ -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>
 
diff --git a/war/xdocs/changes.xml b/war/xdocs/changes.xml
index 42ceb8de..5989e4e3 100644
--- a/war/xdocs/changes.xml
+++ b/war/xdocs/changes.xml
@@ -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>