packages apache-tomcat-6.0.26-build_xml.patch
      Pages: < 1 >  DOWNLOAD      
--- build.xml	2011-02-02 20:07:31.000000000 +0100
+++ build.xml-gil	2011-03-02 06:21:44.000000000 +0100
@@ -462,20 +462,7 @@
     </xslt>
   </target>
 
-  <target name="warn.dbcp" unless="tomcat-dbcp.present">
-    <echo>WARNING: tomcat-dbcp.jar not included, this build can't be used
-    in a release. Please run 'ant download' with JDK1.5 if you are 
-    building a tomcat release.</echo>
-  </target>
-
-  <target name="deploy" depends="build-only,build-docs,warn.dbcp">
-
-    <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}" />
+  <target name="deploy" depends="build-only,build-docs">
 
     <!-- Copy scripts -->
     <copy todir="${tomcat.build}/bin">
@@ -646,209 +633,5 @@
     <delete dir="${tomcat.manifests}" />
   </target>
 
-  <!-- Download and dependency building -->
-  <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="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="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>
-
-  <target name="download"
-          description="Download (and build as necessary) dependent components"
-          depends="build-manifests">
-
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${tomcat-native.loc}"/>
-      <param name="destfile" value="${tomcat-native.tar.gz}"/>
-      <param name="destdir" value="${tomcat-native.home}"/>
-    </antcall>
-
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${tomcat-native.dll}/win32/tcnative-1.dll"/>
-      <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x86"/>
-      <param name="destdir" value="${tomcat-native.home}"/>
-    </antcall>
-
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${tomcat-native.dll}/win64/x64/tcnative-1.dll"/>
-      <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x64"/>
-      <param name="destdir" value="${tomcat-native.home}"/>
-    </antcall>
-
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${tomcat-native.dll}/win64/ia64/tcnative-1.dll"/>
-      <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.i64"/>
-      <param name="destdir" value="${tomcat-native.home}"/>
-    </antcall>
-
-    <!-- Download Commons Daemon -->
-    <antcall target="downloadgz">
-      <param name="sourcefile" value="${commons-daemon.bin.loc}"/>
-      <param name="destfile" value="${commons-daemon.jar}"/>
-    </antcall>
-
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${commons-daemon.native.src.loc}"/>
-      <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
-      <param name="destdir" value="${commons-daemon.home}"/>
-    </antcall>
-
-    <antcall target="downloadzip">
-      <param name="sourcefile" value="${commons-daemon.native.win.loc}"/>
-      <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
-      <param name="destdir" value="${commons-daemon.native.win.home}"/>
-    </antcall>
-
-    <!-- Build Tomcat DBCP bundle -->
-    <antcall target="downloadgz">
-      <param name="sourcefile" value="${commons-pool-src.loc}"/>
-      <param name="destfile" value="${commons-pool.home}/build.xml" />
-    </antcall>
-    <antcall target="downloadgz">
-      <param name="sourcefile" value="${commons-dbcp-src.loc}"/>
-      <param name="destfile" value="${commons-dbcp.home}/build.xml" />
-    </antcall>
-    <mkdir dir="${tomcat-dbcp.home}"/>
-    <antcall target="build-tomcat-dbcp">
-      <param name="basedir" value="${tomcat-dbcp.home}" />
-    </antcall>
-
-    <!-- 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>
-
-    <antcall target="downloadzip">
-      <param name="sourcefile" value="${nsis.loc}"/>
-      <param name="destfile" value="${nsis.exe}"/>
-      <param name="destdir" value="${nsis.home}/.."/>
-    </antcall>
-
-  </target>
-
-  <target name="build-tomcat-dbcp" unless="jdk16.present"
-          depends="build-manifests">
-    <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">
-      <include name="**" />
-    </javac>
-    <jar jarfile="${tomcat-dbcp.jar}"
-         manifest="${tomcat.manifests}/default.manifest">
-      <fileset dir="${tomcat-dbcp.home}/classes">
-        <include name="**/*.class" />
-        <include name="**/*.properties" />
-      </fileset>
-      <zipfileset file="${tomcat.manifests}/default.notice"
-        fullpath="META-INF/NOTICE" />
-      <zipfileset file="${tomcat.manifests}/default.license"
-        fullpath="META-INF/LICENSE" />
-    </jar>
-  </target>
 
 </project>