Author: snicoll
Date: Wed Jun 7 10:27:26 2006
New Revision: 412460
URL: http://svn.apache.org/viewvc?rev=412460&view=rev
Log:
MPWAR-49: Added property maven.war.resources.overwrite to control is resources
overwrites the ones in the generated webapp directory.
Modified:
maven/maven-1/plugins/trunk/war/plugin.jelly
maven/maven-1/plugins/trunk/war/plugin.properties
maven/maven-1/plugins/trunk/war/xdocs/changes.xml
maven/maven-1/plugins/trunk/war/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/war/plugin.jelly
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/war/plugin.jelly?rev=412460&r1=412459&r2=412460&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/war/plugin.jelly Wed Jun 7 10:27:26 2006
@@ -112,12 +112,13 @@
<j:if test="${webSourcesPresent == 'true'}">
<ant:copy todir="${maven.war.webapp.dir}" filtering="on"
- preservelastmodified="true">
+ preservelastmodified="true"
+ overwrite="${maven.war.resources.overwrite}">
<ant:fileset dir="${maven.war.src}"
includes="${maven.war.src.includes}"
excludes="${maven.war.src.excludes}">
</ant:fileset>
- <j:if test="${maven.war.property.expansion}" >
+ <j:if test="${maven.war.property.expansion}" >
<ant:filterchain>
<ant:expandproperties/>
</ant:filterchain>
Modified: maven/maven-1/plugins/trunk/war/plugin.properties
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/war/plugin.properties?rev=412460&r1=412459&r2=412460&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/war/plugin.properties Wed Jun 7 10:27:26 2006
@@ -62,3 +62,7 @@
# Specify if the web.xml contained in the source tree should
# overwrite the one in the generated webapp directory.
maven.war.webxml.overwrite=true
+
+# Specify if resources contained in maven.war.webapp.dir should
+# overwrite existing resources in the generated webapp directory.
+maven.war.resources.overwrite=true
Modified: maven/maven-1/plugins/trunk/war/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/war/xdocs/changes.xml?rev=412460&r1=412459&r2=412460&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/war/xdocs/changes.xml Wed Jun 7 10:27:26 2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.6.2-SNAPSHOT" date="in SVN">
+ <action dev="snicoll" type="update" issue="MPWAR-49">Added property
<code>maven.war.resources.overwrite</code> to control is resources overwrites
the ones in the generated webapp directory.</action>
<action dev="snicoll" type="update" issue="MPWAR-37" due-to="Troy
Poppe">Added ability to expand properties when copying war resources.</action>
<action dev="snicoll" type="update" issue="MPWAR-39">Updated wrong
documentation regarding web.xml filtering.</action>
<action dev="snicoll" type="update" issue="MPWAR-46">Now filtering when
copying resources.</action>
Modified: maven/maven-1/plugins/trunk/war/xdocs/properties.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/war/xdocs/properties.xml?rev=412460&r1=412459&r2=412460&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/war/xdocs/properties.xml Wed Jun 7 10:27:26
2006
@@ -138,6 +138,14 @@
</td>
</tr>
<tr>
+ <td>maven.war.resources.overwrite</td>
+ <td>Yes</td>
+ <td>
+ Specify if resources contained in maven.war.webapp.dir should
overwrite
+ existing resources in the generated webapp directory. Default to
true.
+ </td>
+ </tr>
+ <tr>
<td>maven.war.index</td>
<td>Yes</td>
<td>
