From c4464976fea3c481e2947091126cd2fcc17334cf Mon Sep 17 00:00:00 2001
From: epugh <epugh@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 12 Mar 2003 16:11:58 +0000
Subject: [PATCH] comment out the merging web.xml for now.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113112 13f79535-47bb-0310-9956-ffa450edef68
---
 cactus/src/plugin-resources/scripts/tomcat.4x.jelly | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cactus/src/plugin-resources/scripts/tomcat.4x.jelly b/cactus/src/plugin-resources/scripts/tomcat.4x.jelly
index ca1ae424..73567f78 100644
--- a/cactus/src/plugin-resources/scripts/tomcat.4x.jelly
+++ b/cactus/src/plugin-resources/scripts/tomcat.4x.jelly
@@ -141,8 +141,11 @@
     <!-- Copy the Tomcat web.xml - We need to copy this file as it has
          changed between Tomcat 4.x versions and one version of it doesn't
          work with another version of Tomcat 4 -->
+    <!-- Currently commented out because user's provide their own web.xml 
+    until the merging stuff is working again!
     <copy file="${maven.cactus.tomcat4x.home}/conf/web.xml"
       todir="${maven.cactus.build.dir}/tomcat4x/conf"/>
+    -->  
 
   </goal>