MPWAR-65: Added maven.war.expansion.excludes property to exclude files during a property expansion copy (Fixes corruption of binary files). Applied property expansion to web.xml handling for consistency. Introduced the maven.war.src.filtering property to control whether filtering is enabled or not when copying webapp resources.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@534128 13f79535-47bb-0310-9956-ffa450edef68

war/xdocs/changes.xml

@@ -25,6 +25,11 @@
   </properties>
   <body>
     <release version="1.6.3-SNAPSHOT" date="in SVN">
+      <action dev="snicoll" type="fix" issue="MPWAR-65">Added maven.war.expansion.excludes property
+          to exclude files during a property expansion copy (Fixes corruption of binary files).
+          Applied property expansion to web.xml handling for consistency. Introduced the maven.war.src.filtering
+          property to control whether filtering is enabled or not when copying webapp resources.
+      </action>
       <action dev="ltheussl" type="fix" issue="MPWAR-36">Only create tld and lib folders if corresponding dependencies are present.</action>
       <action dev="ltheussl" type="fix" issue="MPWAR-45" due-to="Kim Dykeman">war:inplace should check for maven.war.src.</action>
       <action dev="ltheussl" type="fix">

war/xdocs/properties.xml

@@ -44,20 +44,40 @@
           <td>maven.war.src.includes</td>
           <td>Yes</td>
           <td>
-            Comma or space separated list of Ant path patterns specifycing
+            Comma or space separated list of Ant path patterns specifying
             what files and directories from <code>${maven.war.src}</code>
-            should be included in the web application. All files are included 
-            by default.
+            that should be included in the web application. All files are
+            included by default.
           </td>
         </tr>
         <tr>
           <td>maven.war.src.excludes</td>
           <td>Yes</td>
           <td>
-            Comma or space separated list of Ant path patterns specifycing
+            Comma or space separated list of Ant path patterns specifying
             what files and directories from <code>${maven.war.src}</code>
-            should be excluded from the web application. No files are excluded 
-            by default.
+            that should be excluded from the web application. No files are
+            excluded by default.
+          </td>
+        </tr>
+        <tr>
+          <td>maven.war.expansion.excludes</td>
+          <td>Yes</td>
+          <td>
+            Comma or space separated list of Ant path patterns specifying
+            the files and directories from <code>${maven.war.src}</code> that
+            should be excluded from the copy when performing property expansion.
+            If property expansion is not enabled this property is ignored. Files
+            in this excludes list are copied to the webapp without property
+            expansion afterwards. No files are excluded by default.
+          </td>
+        </tr>
+        <tr>
+          <td>maven.war.src.filtering</td>
+          <td>Yes</td>
+          <td>
+            Indicates whether token filtering should take place during the copy.
+            Default is true.
           </td>
         </tr>
         <tr>