--- apache-tomcat-7.0.35-src/build.xml~	2013-01-10 23:59:20.000000000 +0100
+++ apache-tomcat-7.0.35-src/build.xml	2013-02-02 10:03:33.530400312 +0100
@@ -439,60 +439,6 @@
     
   </target>
 
-  <target name="validate" if="${execute.validate}"
-    depends="build-prepare,compile-prepare,download-validate"
-    description="Uses Checkstyle tool to perform style check for the source code">
-    <!-- Required so we can cache checkstyle results -->
-    <mkdir dir="${tomcat.output}/res/checkstyle"/>
-
-    <taskdef resource="checkstyletask.properties"
-             classpath="${checkstyle.jar}" />
-    <checkstyle config="res/checkstyle/checkstyle.xml">
-      <fileset dir="." >
-        <patternset refid="text.files" />
-        <include name="**/*.bat"/>
-        <include name="**/*.sh"/>
-        <exclude name="bin/setenv.*"/>
-        <exclude name=".*/**"/>
-        <exclude name="output/**"/>
-        <exclude name="modules/**"/>
-        <exclude name="**/*.mdl"/>
-        <exclude name="**/*_2.xml"/>
-        <exclude name="res/checkstyle/header-al2.txt"/>
-        <!-- Exclude auto-generated files -->
-        <exclude name="java/org/apache/el/parser/ELParser*.java" />
-        <exclude name="java/org/apache/el/parser/Node.java" />
-        <exclude name="java/org/apache/**/parser/JJT*ParserState.java" />
-        <exclude name="java/org/apache/**/parser/ParseException.java" />
-        <exclude name="java/org/apache/**/parser/SimpleCharStream.java" />
-        <exclude name="java/org/apache/**/parser/Token*.java" />
-        <!-- Exclude these else Gump runs validate on them -->
-        <exclude name="**/org/apache/tomcat/dbcp/**"/>
-        <exclude name="**/tomcat-deps/**"/>
-        <!-- Exclude simple test files -->
-        <exclude name="test/webapp-3.0/bug53257/**/*.txt"/>
-        <exclude name="test/webapp-3.0-fragments/WEB-INF/classes/*.txt"/>
-      </fileset>
-      <fileset dir="modules/jdbc-pool" >
-        <exclude name=".*/**"/>
-        <exclude name="**/MANIFEST.MF"/>
-        <patternset refid="text.files" />
-      </fileset>
-    </checkstyle>
-    <!-- javax package checks -->
-    <checkstyle config="res/checkstyle/javax-checkstyle.xml">
-      <fileset dir="java/javax" >
-        <include name="**/*.java"/>
-      </fileset>
-    </checkstyle>
-    <!-- org package checks -->
-    <checkstyle config="res/checkstyle/org-checkstyle.xml">
-      <fileset dir="java/org" >
-        <include name="**/*.java"/>
-      </fileset>
-    </checkstyle>
-  </target>
-
   <target name="validate-eoln" depends="build-prepare,compile-prepare"
     description="Validate that the source files have correct line ends">
 
@@ -531,7 +531,7 @@
   <target name="compile" depends="compile-java6,compile-java7" />
 
   <target name="compile-java6"
-          depends="build-prepare,download-compile,compile-prepare,validate">
+          depends="build-prepare">
     <!-- Compile internal server components -->
     <javac srcdir="java" destdir="${tomcat.classes}"
            debug="${compile.debug}"
@@ -853,13 +799,6 @@
   <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">
@@ -1135,7 +1074,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}"
@@ -1280,7 +1280,7 @@
     </path>
   </target>
 
-  <target name="cobertura-instrument" depends="compile,download-cobertura,cobertura-disabled"
+  <target name="cobertura-instrument" depends="compile,cobertura-disabled"
           if="${test.cobertura}"
           description="Adds Cobertura instrumentation to the compiled bytecode">
 
@@ -1339,52 +1339,10 @@
     <mkdir dir="${tomcat.extras}/webservices"/>
   </target>
 
-  <target name="extras-commons-logging-prepare"
-          depends="extras-prepare"
-          description="Prepare to build web services extras package">
-
-    <antcall target="downloadfile-2">
-      <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
-      <param name="sourcefile.2" value="${commons-logging-src.loc.2}"/>
-      <param name="destfile" value="${commons-logging-src.tar.gz}"/>
-      <param name="destdir" value="${commons-logging.home}"/>
-    </antcall>
-
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${avalon-framework.loc}"/>
-      <param name="destfile" value="${avalon-framework.jar}"/>
-      <param name="destdir" value="${avalon-framework.home}"/>
-    </antcall>
-
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${log4j.loc}"/>
-      <param name="destfile" value="${log4j.jar}"/>
-      <param name="destdir" value="${log4j.home}"/>
-    </antcall>
-
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${logkit.loc}"/>
-      <param name="destfile" value="${logkit.jar}"/>
-      <param name="destdir" value="${logkit.home}"/>
-    </antcall>
-
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${servletapi.loc}"/>
-      <param name="destfile" value="${servletapi.jar}"/>
-      <param name="destdir" value="${servletapi.home}"/>
-    </antcall>
-
-  </target>
-
   <target name="extras-commons-logging"
-          depends="extras-commons-logging-prepare,compile,build-manifests"
+          depends="compile,build-manifests"
           description="Build JULI for log4j extras package">
 
-    <gunzip src="${commons-logging-src.tar.gz}"
-      dest="${tomcat.extras}/logging/commons-logging-src.tar"/>
-    <untar src="${tomcat.extras}/logging/commons-logging-src.tar"
-      dest="${tomcat.extras}/logging/"/>
-
     <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java/org/apache/commons"
         encoding="ISO-8859-1">
       <replacefilter token="org.apache.commons"
@@ -1307,7 +1204,8 @@
       file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml" />
 
     <copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src">
-      <fileset file="${avalon-framework.jar}" />
+      <fileset file="${avalon-framework-api.jar}" />
+      <fileset file="${avalon-framework-impl.jar}" />
       <fileset file="${log4j.jar}" />
       <fileset file="${logkit.jar}" />
       <fileset file="${servletapi.jar}" />
@@ -1387,18 +1285,6 @@
           depends="extras-prepare"
           description="Prepare to build web services extras package">
 
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-      <param name="destfile" value="${jaxrpc-lib.jar}"/>
-      <param name="destdir" value="${jaxrpc-lib.home}"/>
-    </antcall>
-
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
-      <param name="destfile" value="${wsdl4j-lib.jar}"/>
-      <param name="destdir" value="${wsdl4j-lib.home}"/>
-    </antcall>
-
     <copy file="${jaxrpc-lib.jar}"
           tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
     <copy file="${wsdl4j-lib.jar}"
@@ -1505,7 +1391,7 @@
 
   </target>
 
-  <target name="dist-prepare" depends="download-dist">
+  <target name="dist-prepare">
     <mkdir dir="${tomcat.dist}"/>
     <mkdir dir="${tomcat.dist}/bin"/>
     <mkdir dir="${tomcat.dist}/conf"/>
@@ -2458,307 +2458,6 @@ Apache Tomcat ${version} native binaries
     <delete file="webapps/docs/jdbc-pool.xml"/>
   </target>
 
-    
-  <!-- ================ Download and dependency building =================== -->
-
-  <target name="download-validate"
-          description="Download components necessary to validate source"
-          if="${execute.validate}">
-
-    <antcall target="downloadzip">
-      <param name="sourcefile" value="${checkstyle.loc}"/>
-      <param name="destfile" value="${checkstyle.jar}"/>
-      <param name="destdir" value="${base.path}"/>
-    </antcall>
-
-  </target>
-
-  <target name="download-compile"
-          description="Download (and build) components necessary to compile" >
-
-    <antcall target="downloadfile-2">
-      <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-      <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
-      <param name="destfile" value="${tomcat-native.tar.gz}"/>
-      <param name="destdir" value="${tomcat-native.home}"/>
-    </antcall>
-
-    <!-- Download Commons Daemon -->
-    <antcall target="downloadgz-2">
-      <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
-      <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
-      <param name="destfile" value="${commons-daemon.jar}"/>
-    </antcall>
-
-    <antcall target="downloadfile-2">
-      <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
-      <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
-      <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
-      <param name="destdir" value="${commons-daemon.home}"/>
-    </antcall>
-
-    <!-- Download src and build Tomcat DBCP bundle -->
-    <antcall target="downloadgz-2">
-      <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
-      <param name="sourcefile.2" value="${commons-pool-src.loc.2}"/>
-      <param name="destfile" value="${commons-pool.home}/build.xml" />
-    </antcall>
-    <antcall target="downloadgz-2">
-      <param name="sourcefile.1" value="${commons-dbcp-src.loc.1}"/>
-      <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
-      <param name="destfile" value="${commons-dbcp.home}/build.xml" />
-    </antcall>
-    <mkdir dir="${tomcat-dbcp.home}"/>
-    <!-- Rebuild dbcp only if built jars do not exist -->
-    <!-- or new versions of pool or dbcp have been downloaded. -->
-    <condition property="no.build.dbcp">
-      <and>
-        <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp.jar}" />
-        <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp-src.jar}" />
-        <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp.jar}" />
-        <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp-src.jar}" />
-      </and>
-    </condition>
-    <antcall target="build-tomcat-dbcp" />
-
-    <!-- Download JDT (Eclipse compiler) -->
-    <antcall target="downloadfile-2">
-      <param name="sourcefile.1" value="${jdt.loc.1}"/>
-      <param name="sourcefile.2" value="${jdt.loc.2}"/>
-      <param name="destfile" value="${jdt.jar}"/>
-      <param name="destdir" value="${jdt.home}"/>
-    </antcall>
-  </target>
-
-  <target name="download-test-compile"
-          description="Download additional components for the tests" >
-
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${junit.loc}"/>
-      <param name="destfile" value="${junit.jar}"/>
-      <param name="destdir" value="${junit.home}"/>
-    </antcall>
-
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${hamcrest.loc}"/>
-      <param name="destfile" value="${hamcrest.jar}"/>
-      <param name="destdir" value="${hamcrest.home}"/>
-    </antcall>
-
-  </target>
-
-  <target name="download-cobertura"
-          if="${test.cobertura}"
-          description="Download the Cobertura code coverage tool" >
-
-    <antcall target="downloadgz">
-      <param name="sourcefile" value="${cobertura.loc}"/>
-      <param name="destfile" value="${cobertura.jar}"/>
-    </antcall>
-
-  </target>
-
-  <target name="download-dist"
-          description="Download additional components for a distribution" >
-
-    <antcall target="downloadzip-2">
-      <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
-      <param name="sourcefile.2" value="${tomcat-native.win.2}"/>
-      <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
-      <param name="destdir" value="${tomcat-native.home}"/>
-    </antcall>
-
-    <antcall target="downloadzip-2">
-      <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>
-      <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>
-      <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
-      <param name="destdir" value="${commons-daemon.native.win.home}"/>
-    </antcall>
-
-    <antcall target="downloadzip">
-      <param name="sourcefile" value="${nsis.loc}"/>
-      <param name="destfile" value="${nsis.exe}"/>
-      <param name="destdir" value="${nsis.home}/.."/>
-    </antcall>
-
-  </target>
-
-
-  <!-- =============== Targets for dependencies that need to =============== -->
-  <!-- ================  be built rather than used directly ================ -->
-
-  <target name="build-tomcat-dbcp" depends="build-manifests" unless="no.build.dbcp">
-    <copy todir="${tomcat-dbcp.home}">
-      <fileset dir="${commons-pool.home}">
-        <include name="**/*.java" />
-        <exclude name="**/test/**" />
-      </fileset>
-      <fileset dir="${commons-dbcp.home}">
-        <include name="**/*.java" />
-        <exclude name="**/test/**" />
-        <exclude name="**/managed/**" />
-      </fileset>
-    </copy>
-    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
-        encoding="ISO-8859-1">
-      <replacefilter token="org.apache.commons"
-            value="org.apache.tomcat.dbcp" />
-    </replace>
-    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl"
-        encoding="ISO-8859-1">
-      <replacefilter token="enum"
-            value="enumeration" />
-    </replace>
-
-    <mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" />
-    <move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp">
-      <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
-    </move>
-    <mkdir dir="${tomcat-dbcp.home}/classes"/>
-    <javac destdir="${tomcat-dbcp.home}/classes"
-           optimize="off"
-           debug="${compile.debug}"
-           deprecation="${compile.deprecation}"
-           source="${compile.source}"
-           target="${compile.target}"
-           sourcepath="${tomcat-dbcp.home}/src/java"
-           srcdir="${tomcat-dbcp.home}/src/java"
-           encoding="ISO-8859-1"
-           includeantruntime="false">
-      <include name="**" />
-    </javac>
-    <jarIt jarfile="${tomcat-dbcp.jar}"
-      filesDir="${tomcat-dbcp.home}/classes"
-      filesId="files.tomcat-dbcp" />
-    <jarIt jarfile="${tomcat-dbcp-src.jar}"
-      filesDir="${tomcat-dbcp.home}/src/java"
-      filesId="files.tomcat-dbcp" />
-  </target>
-
-  <!-- =============== Utility Targets to support downloads ================ -->
-
-  <target name="proxyflags">
-    <!-- check proxy parameters. -->
-    <condition property="useproxy">
-      <equals arg1="${proxy.use}" arg2="on" />
-    </condition>
-  </target>
-
-  <target name="setproxy" depends="proxyflags" if="useproxy">
-    <taskdef name="setproxy"
-            classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
-    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-              proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
-    <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
-  </target>
-
-  <target name="testexist">
-    <echo message="Testing  for ${destfile}"/>
-    <available file="${destfile}" property="exist"/>
-  </target>
-
-  <target name="downloadgz" unless="exist" depends="setproxy,testexist">
-    <!-- Download and extract the package -->
-    <get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
-    <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
-    <untar src="${base.path}/file.tar" dest="${base.path}"/>
-    <delete file="${base.path}/file.tar"/>
-    <delete file="${base.path}/file.tar.gz"/>
-  </target>
-
-  <target name="downloadgz-2" unless="exist" depends="setproxy,testexist">
-    <!-- Download and extract the package from the two alternative locations -->
-    <delete file="${base.path}/file.tar" quiet="true" />
-    <delete file="${base.path}/file.tar.gz" quiet="true" />
-    <antcall target="trydownload">
-      <param name="sourcefile" value="${sourcefile.1}" />
-      <param name="destfile" value="${base.path}/file.tar.gz" />
-    </antcall>
-    <antcall target="trydownload">
-      <param name="sourcefile" value="${sourcefile.2}" />
-      <param name="destfile" value="${base.path}/file.tar.gz" />
-    </antcall>
-    <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
-    <untar src="${base.path}/file.tar" dest="${base.path}"/>
-    <delete file="${base.path}/file.tar"/>
-    <delete file="${base.path}/file.tar.gz"/>
-  </target>
-
-  <target name="downloadzip" unless="exist" depends="setproxy,testexist">
-    <!-- Download and extract the package -->
-    <get src="${sourcefile}" dest="${base.path}/file.zip" />
-    <mkdir dir="${destdir}" />
-    <unzip src="${base.path}/file.zip" dest="${destdir}"/>
-    <delete file="${base.path}/file.zip"/>
-  </target>
-
-  <target name="downloadzip-2" unless="exist" depends="testexist">
-    <!-- Download and extract the package from the two alternative locations -->
-    <delete file="${base.path}/file.zip" quiet="true" />
-    <antcall target="trydownload">
-      <param name="sourcefile" value="${sourcefile.1}" />
-      <param name="destfile" value="${base.path}/file.zip" />
-    </antcall>
-    <antcall target="trydownload">
-      <param name="sourcefile" value="${sourcefile.2}" />
-      <param name="destfile" value="${base.path}/file.zip" />
-    </antcall>
-    <mkdir dir="${destdir}" />
-    <unzip src="${base.path}/file.zip" dest="${destdir}"/>
-    <delete file="${base.path}/file.zip"/>
-  </target>
-
-  <target name="downloadfile" unless="exist" depends="setproxy,testexist">
-    <!-- Download extract the file -->
-    <mkdir dir="${destdir}" />
-    <get src="${sourcefile}" dest="${destfile}" />
-  </target>
-
-  <target name="downloadfile-2" unless="exist" depends="testexist">
-    <!-- Download the file from the two alternative locations -->
-    <mkdir dir="${destdir}" />
-
-    <antcall target="trydownload">
-      <param name="sourcefile" value="${sourcefile.1}" />
-    </antcall>
-
-    <antcall target="trydownload">
-      <param name="sourcefile" value="${sourcefile.2}" />
-    </antcall>
-
-    <available file="${destfile}" property="exist"/>
-    <fail unless="exist" message="Failed to download [${destfile}]. All download sources are unavailable." />
-  </target>
-
-  <target name="trydownload.check" depends="setproxy">
-    <condition property="trydownload.run">
-      <and>
-        <not>
-          <available file="${destfile}" />
-        </not>
-        <http url="${sourcefile}" />
-      </and>
-    </condition>
-  </target>
-
-  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-    <!-- Downloads a file if not yet downloaded and the source URL is available -->
-    <get src="${sourcefile}" dest="${destfile}" />
-  </target>
-
-  <!-- ============================ IDE Support ============================ -->
-
-  <target name="ide-eclipse" depends="deploy, extras-webservices-prepare"
-          description="Prepares the source tree to be built in Eclipse">
-
-    <!-- Copy the sample project files into the root directory -->
-    <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-    <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.classpath" tofile="${tomcat.home}/.classpath"/>
-
-    <echo>Eclipse project files created.
-Read the Building page on the Apache Tomcat documentation site for details on how to configure your Eclipse workplace.</echo>
-  </target>
-
   <!-- ======================= Macros, Taskdefs etc ======================== -->
 
   <macrodef name="jarIt" description="utility macro for standard JAR packaging">