0N/A--- apache-tomcat-6.0.28-src/build.xml.orig Tue Jun 29 07:33:40 2010

1204N/A+++ apache-tomcat-6.0.28-src/build.xml Fri Jul 9 08:12:35 2010

0N/A@@ -471,13 +471,6 @@

0N/A

0N/A <target name="deploy" depends="build-only,build-docs,warn.dbcp">

0N/A

0N/A- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"

0N/A- file="${tomcat-native.tar.gz}" />

0N/A- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"

0N/A- file="${commons-daemon.native.src.tgz}" />

0N/A-

0N/A- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />

0N/A-

0N/A <!-- Copy scripts -->

0N/A <copy todir="${tomcat.build}/bin">

0N/A <fileset dir="bin">

0N/A@@ -696,48 +689,6 @@

0N/A description="Download (and build as necessary) dependent components"

0N/A depends="build-manifests">

0N/A

0N/A- <antcall target="downloadfile">

0N/A- <param name="sourcefile" value="${tomcat-native.loc}"/>

0N/A- <param name="destfile" value="${tomcat-native.tar.gz}"/>

0N/A- <param name="destdir" value="${tomcat-native.home}"/>

0N/A- </antcall>

0N/A-

0N/A- <antcall target="downloadfile">

0N/A- <param name="sourcefile" value="${tomcat-native.dll}/win32/tcnative-1.dll"/>

0N/A- <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x86"/>

0N/A- <param name="destdir" value="${tomcat-native.home}"/>

0N/A- </antcall>

0N/A-

0N/A- <antcall target="downloadfile">

0N/A- <param name="sourcefile" value="${tomcat-native.dll}/win64/x64/tcnative-1.dll"/>

0N/A- <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x64"/>

0N/A- <param name="destdir" value="${tomcat-native.home}"/>

0N/A- </antcall>

0N/A-

0N/A- <antcall target="downloadfile">

0N/A- <param name="sourcefile" value="${tomcat-native.dll}/win64/ia64/tcnative-1.dll"/>

0N/A- <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.i64"/>

0N/A- <param name="destdir" value="${tomcat-native.home}"/>

0N/A- </antcall>

0N/A-

0N/A- <!-- Download Commons Daemon -->

0N/A- <antcall target="downloadgz">

0N/A- <param name="sourcefile" value="${commons-daemon.bin.loc}"/>

0N/A- <param name="destfile" value="${commons-daemon.jar}"/>

0N/A- </antcall>

0N/A-

0N/A- <antcall target="downloadfile">

0N/A- <param name="sourcefile" value="${commons-daemon.native.src.loc}"/>

0N/A- <param name="destfile" value="${commons-daemon.native.src.tgz}"/>

0N/A- <param name="destdir" value="${commons-daemon.home}"/>

0N/A- </antcall>

0N/A-

0N/A- <antcall target="downloadzip">

0N/A- <param name="sourcefile" value="${commons-daemon.native.win.loc}"/>

0N/A- <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>

0N/A- <param name="destdir" value="${commons-daemon.native.win.home}"/>

0N/A- </antcall>

0N/A-

0N/A <!-- Build Tomcat DBCP bundle -->

0N/A <antcall target="downloadgz">

0N/A <param name="sourcefile" value="${commons-pool-src.loc}"/>

0N/A@@ -763,15 +714,9 @@

0N/A <param name="basedir" value="${jasper-jdt.home}" />

0N/A </antcall>

0N/A

0N/A- <antcall target="downloadzip">

0N/A- <param name="sourcefile" value="${nsis.loc}"/>

0N/A- <param name="destfile" value="${nsis.exe}"/>

0N/A- <param name="destdir" value="${nsis.home}/.."/>

0N/A- </antcall>

0N/A-

0N/A </target>

0N/A

0N/A- <target name="build-tomcat-dbcp" unless="jdk16.present"

0N/A+ <target name="build-tomcat-dbcp"

0N/A depends="build-manifests">

0N/A <copy todir="${tomcat-dbcp.home}">

0N/A <fileset dir="${commons-pool.home}">

0N/A