Apply MAVEN-831

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

war/plugin.jelly

@@ -99,7 +99,10 @@
       </ant:copy>
     </j:if>
     
-   
+    <ant:copy file="${maven.war.webxml}"
+         tofile="${webapp.build.webinf}/web.xml"
+         overwrite="true" />
+
     <j:forEach var="lib" items="${pom.artifacts}">
       <j:set var="dep" value="${lib.dependency}"/>     
       <j:if test="${dep.getProperty('war.bundle')=='true'}">

war/xdocs/changes.xml

@@ -8,6 +8,10 @@
   <body>
 
     <release version="1.4" date="in CVS">
+      <action dev="dion" type="update">
+        Apply MAVEN-831.
+        Copy web.xml as specified by ${maven.war.webxml}
+      </action>
       <action dev="dion" type="update">Add test project</action>
       <action dev="evenisse" type="add">
        Added maven.war.index property.