1 files changed, 136 insertions, 0 deletions
diff --git a/www-servers/tomcat/files/7/7.0.11-build-xml.patch b/www-servers/tomcat/files/7/7.0.11-build-xml.patch
new file mode 100644
index 000000000000..72d67161fd66
--- /dev/null
+++ b/www-servers/tomcat/files/7/7.0.11-build-xml.patch
@@ -0,0 +1,136 @@
+--- build.xml.orig	2011-03-05 14:11:01.000000000 +0100
++++ build.xml	2011-03-08 17:39:53.752257789 +0100
+@@ -147,6 +147,7 @@
+   
+   <!-- Classpaths -->
+   <path id="compile.classpath">
++    <pathelement location="${ant.jar}"/>
+     <pathelement location="${jdt.jar}"/>
+   </path>
+ 
+@@ -291,6 +292,7 @@
+     <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
+     <exclude name="org/apache/catalina/tribes/**" />
+     <exclude name="org/apache/naming/factory/webservices/**" />
++    <exclude name="javax/servlet/**" />
+   </patternset>
+ 
+   <patternset id="files.catalina-tribes">
+@@ -420,7 +422,7 @@
+     
+   </target>
+ 
+-  <target name="validate" depends="download-validate" if="${execute.validate}">
++  <target name="validate" if="${execute.validate}">
+     <!-- Required so we can cache checkstyle results -->
+     <mkdir dir="${tomcat.output}/res/checkstyle"/>
+ 
+@@ -464,7 +466,7 @@
+     </checkstyle>
+   </target>
+ 
+-  <target name="compile" depends="build-prepare,download-compile,validate">
++  <target name="compile" depends="build-prepare,validate">
+ 
+     <!-- Compile internal server components -->
+     <javac srcdir="java" destdir="${tomcat.classes}"
+@@ -525,7 +527,7 @@
+       filesId="files.annotations-api"
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+-    <!-- Servlet 3.0 Implementation JAR File -->
++<!-- Servlet 3.0 Implementation JAR File
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+@@ -533,7 +535,7 @@
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
+ 
+-    <!-- JSP 2.2 Implementation JAR File -->
++    JSP 2.2 Implementation JAR File
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+@@ -541,12 +543,12 @@
+       notice="${tomcat.manifests}/jsp-api.jar.notice"
+       license="${tomcat.manifests}/jsp-api.jar.license" />
+ 
+-    <!-- JSP 2.2 EL Implementation JAR File -->
++    JSP 2.2 EL Implementation JAR File
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
+-
++-->
+     <!-- Bootstrap JAR File -->
+     <jarIt jarfile="${bootstrap.jar}"
+       filesDir="${tomcat.classes}"
+@@ -637,7 +639,7 @@
+ 
+   </target>
+ 
+-  <target name="build-docs" description="Builds all documentation from XML sources">
++  <target name="build-docs" unless="nobuild.docs" description="Builds all documentation from XML sources">
+ 
+     <copy todir="${tomcat.build}/webapps">
+       <fileset dir="webapps">
+@@ -745,14 +747,14 @@
+ 
+   <target name="deploy" depends="package,build-docs"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+ 
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -809,7 +811,7 @@
+              source="${compile.source}"
+              target="${compile.target}"
+              optimize="${compile.optimize}"
+-             classpath="${tomcat.classes}"
++             classpath="${tomcat.classes}:${jsp-api.jar}"
+              excludes="**/CVS/**,**/.svn/**"
+              encoding="ISO-8859-1"
+              includeantruntime="false">
+@@ -821,7 +823,7 @@
+              source="${compile.source}"
+              target="${compile.target}"
+              optimize="${compile.optimize}"
+-             classpath="$tomcat.lcasses}"
++             classpath="${tomcat.classes}:${jsp-api.jar}"
+              excludes="**/CVS/**,**/.svn/**"
+              encoding="ISO-8859-1"
+              includeantruntime="false">
+@@ -829,11 +831,11 @@
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+-
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
+-
++-->
+   </target>
+ 
+   <target name="examples-sources" description="Create examples sources"
+@@ -1008,7 +1010,7 @@
+ 
+   </target>
+ 
+-  <target name="test-compile" depends="compile,download-test-compile" >
++  <target name="test-compile" depends="compile" >
+     <mkdir dir="${test.classes}"/>
+     <!-- Compile -->
+     <javac srcdir="test" destdir="${test.classes}"