From fd8e72996235beab083710a10d7c3abcb5aca6d0 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 24 Sep 2003 05:21:45 +0000
Subject: [PATCH] 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      | 5 ++++-
 war/xdocs/changes.xml | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/war/plugin.jelly b/war/plugin.jelly
index d831652f..a9cff23b 100644
--- a/war/plugin.jelly
+++ b/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'}">
diff --git a/war/xdocs/changes.xml b/war/xdocs/changes.xml
index 4708fa28..f09c9d1e 100644
--- a/war/xdocs/changes.xml
+++ b/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.