Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MPWAR-52: Added property maven.war.webxml.overwrite to control if the source web.xml overwrite the one in the generated webapp directory.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@396304 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
snicoll 2006-04-23 19:13:13 +00:00
parent 8c17a346b0
commit 33951d7bd9
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
war/plugin.jelly
View File

@ -122,7 +122,7 @@
<util:available file="${maven.war.webxml}"> <util:available file="${maven.war.webxml}">
<ant:copy file="${maven.war.webxml}" <ant:copy file="${maven.war.webxml}"
tofile="${webapp.build.webinf}/web.xml" tofile="${webapp.build.webinf}/web.xml"
overwrite="true" /> overwrite="${maven.war.webxml.overwrite}" />
</util:available> </util:available>
</goal> </goal>

4
war/plugin.properties
View File

@ -54,3 +54,7 @@ maven.war.tld.dir=WEB-INF/tld
# Location of the manifest file to be used # Location of the manifest file to be used
maven.war.manifest=${maven.war.src}/META-INF/MANIFEST.MF maven.war.manifest=${maven.war.src}/META-INF/MANIFEST.MF
# Specify if the web.xml contained in the source tree should
# overwrite the one in the generated webapp directory.
maven.war.webxml.overwrite=true

1
war/xdocs/changes.xml
View File

@ -25,6 +25,7 @@
</properties> </properties>
<body> <body>
<release version="1.6.2-SNAPSHOT" date="in SVN"> <release version="1.6.2-SNAPSHOT" date="in SVN">
<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-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> <action dev="snicoll" type="fix" issue="MPWAR-32">License file is now added properly to the generated war</action>
<action dev="brett" type="fix">Remove reference to unused caller tag library to suppress warning</action> <action dev="brett" type="fix">Remove reference to unused caller tag library to suppress warning</action>

8
war/xdocs/properties.xml
View File

@ -121,6 +121,14 @@
<code>${maven.war.src}/META-INF/MANIFEST.MF</code>. <code>${maven.war.src}/META-INF/MANIFEST.MF</code>.
</td> </td>
</tr> </tr>
<tr>
<td>maven.war.webxml.overwrite</td>
<td>Yes</td>
<td>
Specify if the web.xml contained in the source tree should overwrite
the one in the generated webapp directory. Default to true.
</td>
</tr>
<tr> <tr>
<td>maven.war.index</td> <td>maven.war.index</td>
<td>Yes</td> <td>Yes</td>