<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
<fileset dir="bin">
-@@ -1239,7 +1178,7 @@
+@@ -1198,7 +1198,7 @@
</target>
-- <target name="test-compile" depends="compile,download-test-compile" >
-+ <target name="test-compile" depends="compile" >
+- <target name="test-compile" depends="compile,download-test-compile,compile-webapp-examples" >
++ <target name="test-compile" depends="compile,compile-webapp-examples" >
<mkdir dir="${test.classes}"/>
<!-- Compile -->
<javac srcdir="test" destdir="${test.classes}"
<mkdir dir="${tomcat.dist}"/>
<mkdir dir="${tomcat.dist}/bin"/>
<mkdir dir="${tomcat.dist}/conf"/>
-@@ -2602,292 +2488,6 @@
- </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"
-- 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}" httpusecaches="${trydownload.httpusecaches}" 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}" httpusecaches="${trydownload.httpusecaches}" 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}" httpusecaches="${trydownload.httpusecaches}" 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}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
-- </target>
--
- <!-- ============================ IDE Support ============================ -->
-
- <target name="ide-eclipse" depends="deploy, extras-webservices-prepare"
projects / packages / tomcat.git / blobdiff