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

@@ -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>