1 --- apache-tomcat-7.0.35-src/build.xml~ 2013-01-10 23:59:20.000000000 +0100
2 +++ apache-tomcat-7.0.35-src/build.xml 2013-02-02 10:03:33.530400312 +0100
7 - <target name="validate" if="${execute.validate}"
8 - depends="build-prepare,compile-prepare,download-validate"
9 - description="Uses Checkstyle tool to perform style check for the source code">
10 - <!-- Required so we can cache checkstyle results -->
11 - <mkdir dir="${tomcat.output}/res/checkstyle"/>
13 - <taskdef resource="checkstyletask.properties"
14 - classpath="${checkstyle.jar}" />
15 - <checkstyle config="res/checkstyle/checkstyle.xml">
17 - <patternset refid="text.files" />
18 - <include name="**/*.bat"/>
19 - <include name="**/*.sh"/>
20 - <exclude name="bin/setenv.*"/>
21 - <exclude name=".*/**"/>
22 - <exclude name="output/**"/>
23 - <exclude name="modules/**"/>
24 - <exclude name="**/*.mdl"/>
25 - <exclude name="**/*_2.xml"/>
26 - <exclude name="res/checkstyle/header-al2.txt"/>
27 - <!-- Exclude auto-generated files -->
28 - <exclude name="java/org/apache/el/parser/ELParser*.java" />
29 - <exclude name="java/org/apache/el/parser/Node.java" />
30 - <exclude name="java/org/apache/**/parser/JJT*ParserState.java" />
31 - <exclude name="java/org/apache/**/parser/ParseException.java" />
32 - <exclude name="java/org/apache/**/parser/SimpleCharStream.java" />
33 - <exclude name="java/org/apache/**/parser/Token*.java" />
34 - <!-- Exclude these else Gump runs validate on them -->
35 - <exclude name="**/org/apache/tomcat/dbcp/**"/>
36 - <exclude name="**/tomcat-deps/**"/>
37 - <!-- Exclude simple test files -->
38 - <exclude name="test/webapp-3.0/bug53257/**/*.txt"/>
39 - <exclude name="test/webapp-3.0-fragments/WEB-INF/classes/*.txt"/>
41 - <fileset dir="modules/jdbc-pool" >
42 - <exclude name=".*/**"/>
43 - <exclude name="**/MANIFEST.MF"/>
44 - <patternset refid="text.files" />
47 - <!-- javax package checks -->
48 - <checkstyle config="res/checkstyle/javax-checkstyle.xml">
49 - <fileset dir="java/javax" >
50 - <include name="**/*.java"/>
53 - <!-- org package checks -->
54 - <checkstyle config="res/checkstyle/org-checkstyle.xml">
55 - <fileset dir="java/org" >
56 - <include name="**/*.java"/>
61 <target name="validate-eoln" depends="build-prepare,compile-prepare"
62 description="Validate that the source files have correct line ends">
65 <target name="compile" depends="compile-java6,compile-java7" />
67 <target name="compile-java6"
68 - depends="build-prepare,download-compile,compile-prepare,validate">
69 + depends="build-prepare">
70 <!-- Compile internal server components -->
71 <javac srcdir="java" destdir="${tomcat.classes}"
72 debug="${compile.debug}"
74 <target name="deploy" depends="package,build-docs"
75 description="Default. Builds a working Tomcat instance">
77 - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
78 - file="${tomcat-native.tar.gz}" />
79 - <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
80 - file="${commons-daemon.native.src.tgz}" />
82 - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
85 <copy todir="${tomcat.build}/bin">
91 - <target name="test-compile" depends="compile,download-test-compile" >
92 + <target name="test-compile" depends="compile" >
93 <mkdir dir="${test.classes}"/>
95 <javac srcdir="test" destdir="${test.classes}"
100 - <target name="cobertura-instrument" depends="compile,download-cobertura,cobertura-disabled"
101 + <target name="cobertura-instrument" depends="compile,cobertura-disabled"
102 if="${test.cobertura}"
103 description="Adds Cobertura instrumentation to the compiled bytecode">
105 @@ -1339,52 +1339,10 @@
106 <mkdir dir="${tomcat.extras}/webservices"/>
109 - <target name="extras-commons-logging-prepare"
110 - depends="extras-prepare"
111 - description="Prepare to build web services extras package">
113 - <antcall target="downloadfile-2">
114 - <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
115 - <param name="sourcefile.2" value="${commons-logging-src.loc.2}"/>
116 - <param name="destfile" value="${commons-logging-src.tar.gz}"/>
117 - <param name="destdir" value="${commons-logging.home}"/>
120 - <antcall target="downloadfile">
121 - <param name="sourcefile" value="${avalon-framework.loc}"/>
122 - <param name="destfile" value="${avalon-framework.jar}"/>
123 - <param name="destdir" value="${avalon-framework.home}"/>
126 - <antcall target="downloadfile">
127 - <param name="sourcefile" value="${log4j.loc}"/>
128 - <param name="destfile" value="${log4j.jar}"/>
129 - <param name="destdir" value="${log4j.home}"/>
132 - <antcall target="downloadfile">
133 - <param name="sourcefile" value="${logkit.loc}"/>
134 - <param name="destfile" value="${logkit.jar}"/>
135 - <param name="destdir" value="${logkit.home}"/>
138 - <antcall target="downloadfile">
139 - <param name="sourcefile" value="${servletapi.loc}"/>
140 - <param name="destfile" value="${servletapi.jar}"/>
141 - <param name="destdir" value="${servletapi.home}"/>
146 <target name="extras-commons-logging"
147 - depends="extras-commons-logging-prepare,compile,build-manifests"
148 + depends="compile,build-manifests"
149 description="Build JULI for log4j extras package">
151 - <gunzip src="${commons-logging-src.tar.gz}"
152 - dest="${tomcat.extras}/logging/commons-logging-src.tar"/>
153 - <untar src="${tomcat.extras}/logging/commons-logging-src.tar"
154 - dest="${tomcat.extras}/logging/"/>
156 <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java/org/apache/commons"
157 encoding="ISO-8859-1">
158 <replacefilter token="org.apache.commons"
159 @@ -1307,7 +1204,8 @@
160 file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml" />
162 <copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src">
163 - <fileset file="${avalon-framework.jar}" />
164 + <fileset file="${avalon-framework-api.jar}" />
165 + <fileset file="${avalon-framework-impl.jar}" />
166 <fileset file="${log4j.jar}" />
167 <fileset file="${logkit.jar}" />
168 <fileset file="${servletapi.jar}" />
169 @@ -1387,18 +1285,6 @@
170 depends="extras-prepare"
171 description="Prepare to build web services extras package">
173 - <antcall target="downloadfile">
174 - <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
175 - <param name="destfile" value="${jaxrpc-lib.jar}"/>
176 - <param name="destdir" value="${jaxrpc-lib.home}"/>
179 - <antcall target="downloadfile">
180 - <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
181 - <param name="destfile" value="${wsdl4j-lib.jar}"/>
182 - <param name="destdir" value="${wsdl4j-lib.home}"/>
185 <copy file="${jaxrpc-lib.jar}"
186 tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
187 <copy file="${wsdl4j-lib.jar}"
188 @@ -1505,7 +1391,7 @@
192 - <target name="dist-prepare" depends="download-dist">
193 + <target name="dist-prepare">
194 <mkdir dir="${tomcat.dist}"/>
195 <mkdir dir="${tomcat.dist}/bin"/>
196 <mkdir dir="${tomcat.dist}/conf"/>
197 @@ -2458,307 +2458,6 @@ Apache Tomcat ${version} native binaries
198 <delete file="webapps/docs/jdbc-pool.xml"/>
202 - <!-- ================ Download and dependency building =================== -->
204 - <target name="download-validate"
205 - description="Download components necessary to validate source"
206 - if="${execute.validate}">
208 - <antcall target="downloadzip">
209 - <param name="sourcefile" value="${checkstyle.loc}"/>
210 - <param name="destfile" value="${checkstyle.jar}"/>
211 - <param name="destdir" value="${base.path}"/>
216 - <target name="download-compile"
217 - description="Download (and build) components necessary to compile" >
219 - <antcall target="downloadfile-2">
220 - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
221 - <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
222 - <param name="destfile" value="${tomcat-native.tar.gz}"/>
223 - <param name="destdir" value="${tomcat-native.home}"/>
226 - <!-- Download Commons Daemon -->
227 - <antcall target="downloadgz-2">
228 - <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
229 - <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
230 - <param name="destfile" value="${commons-daemon.jar}"/>
233 - <antcall target="downloadfile-2">
234 - <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
235 - <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
236 - <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
237 - <param name="destdir" value="${commons-daemon.home}"/>
240 - <!-- Download src and build Tomcat DBCP bundle -->
241 - <antcall target="downloadgz-2">
242 - <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
243 - <param name="sourcefile.2" value="${commons-pool-src.loc.2}"/>
244 - <param name="destfile" value="${commons-pool.home}/build.xml" />
246 - <antcall target="downloadgz-2">
247 - <param name="sourcefile.1" value="${commons-dbcp-src.loc.1}"/>
248 - <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
249 - <param name="destfile" value="${commons-dbcp.home}/build.xml" />
251 - <mkdir dir="${tomcat-dbcp.home}"/>
252 - <!-- Rebuild dbcp only if built jars do not exist -->
253 - <!-- or new versions of pool or dbcp have been downloaded. -->
254 - <condition property="no.build.dbcp">
256 - <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp.jar}" />
257 - <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp-src.jar}" />
258 - <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp.jar}" />
259 - <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp-src.jar}" />
262 - <antcall target="build-tomcat-dbcp" />
264 - <!-- Download JDT (Eclipse compiler) -->
265 - <antcall target="downloadfile-2">
266 - <param name="sourcefile.1" value="${jdt.loc.1}"/>
267 - <param name="sourcefile.2" value="${jdt.loc.2}"/>
268 - <param name="destfile" value="${jdt.jar}"/>
269 - <param name="destdir" value="${jdt.home}"/>
273 - <target name="download-test-compile"
274 - description="Download additional components for the tests" >
276 - <antcall target="downloadfile">
277 - <param name="sourcefile" value="${junit.loc}"/>
278 - <param name="destfile" value="${junit.jar}"/>
279 - <param name="destdir" value="${junit.home}"/>
282 - <antcall target="downloadfile">
283 - <param name="sourcefile" value="${hamcrest.loc}"/>
284 - <param name="destfile" value="${hamcrest.jar}"/>
285 - <param name="destdir" value="${hamcrest.home}"/>
290 - <target name="download-cobertura"
291 - if="${test.cobertura}"
292 - description="Download the Cobertura code coverage tool" >
294 - <antcall target="downloadgz">
295 - <param name="sourcefile" value="${cobertura.loc}"/>
296 - <param name="destfile" value="${cobertura.jar}"/>
301 - <target name="download-dist"
302 - description="Download additional components for a distribution" >
304 - <antcall target="downloadzip-2">
305 - <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
306 - <param name="sourcefile.2" value="${tomcat-native.win.2}"/>
307 - <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
308 - <param name="destdir" value="${tomcat-native.home}"/>
311 - <antcall target="downloadzip-2">
312 - <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>
313 - <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>
314 - <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
315 - <param name="destdir" value="${commons-daemon.native.win.home}"/>
318 - <antcall target="downloadzip">
319 - <param name="sourcefile" value="${nsis.loc}"/>
320 - <param name="destfile" value="${nsis.exe}"/>
321 - <param name="destdir" value="${nsis.home}/.."/>
327 - <!-- =============== Targets for dependencies that need to =============== -->
328 - <!-- ================ be built rather than used directly ================ -->
330 - <target name="build-tomcat-dbcp" depends="build-manifests" unless="no.build.dbcp">
331 - <copy todir="${tomcat-dbcp.home}">
332 - <fileset dir="${commons-pool.home}">
333 - <include name="**/*.java" />
334 - <exclude name="**/test/**" />
336 - <fileset dir="${commons-dbcp.home}">
337 - <include name="**/*.java" />
338 - <exclude name="**/test/**" />
339 - <exclude name="**/managed/**" />
342 - <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
343 - encoding="ISO-8859-1">
344 - <replacefilter token="org.apache.commons"
345 - value="org.apache.tomcat.dbcp" />
347 - <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl"
348 - encoding="ISO-8859-1">
349 - <replacefilter token="enum"
350 - value="enumeration" />
353 - <mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" />
354 - <move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp">
355 - <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
357 - <mkdir dir="${tomcat-dbcp.home}/classes"/>
358 - <javac destdir="${tomcat-dbcp.home}/classes"
360 - debug="${compile.debug}"
361 - deprecation="${compile.deprecation}"
362 - source="${compile.source}"
363 - target="${compile.target}"
364 - sourcepath="${tomcat-dbcp.home}/src/java"
365 - srcdir="${tomcat-dbcp.home}/src/java"
366 - encoding="ISO-8859-1"
367 - includeantruntime="false">
368 - <include name="**" />
370 - <jarIt jarfile="${tomcat-dbcp.jar}"
371 - filesDir="${tomcat-dbcp.home}/classes"
372 - filesId="files.tomcat-dbcp" />
373 - <jarIt jarfile="${tomcat-dbcp-src.jar}"
374 - filesDir="${tomcat-dbcp.home}/src/java"
375 - filesId="files.tomcat-dbcp" />
378 - <!-- =============== Utility Targets to support downloads ================ -->
380 - <target name="proxyflags">
381 - <!-- check proxy parameters. -->
382 - <condition property="useproxy">
383 - <equals arg1="${proxy.use}" arg2="on" />
387 - <target name="setproxy" depends="proxyflags" if="useproxy">
388 - <taskdef name="setproxy"
389 - classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
390 - <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
391 - proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
392 - <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
395 - <target name="testexist">
396 - <echo message="Testing for ${destfile}"/>
397 - <available file="${destfile}" property="exist"/>
400 - <target name="downloadgz" unless="exist" depends="setproxy,testexist">
401 - <!-- Download and extract the package -->
402 - <get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
403 - <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
404 - <untar src="${base.path}/file.tar" dest="${base.path}"/>
405 - <delete file="${base.path}/file.tar"/>
406 - <delete file="${base.path}/file.tar.gz"/>
409 - <target name="downloadgz-2" unless="exist" depends="setproxy,testexist">
410 - <!-- Download and extract the package from the two alternative locations -->
411 - <delete file="${base.path}/file.tar" quiet="true" />
412 - <delete file="${base.path}/file.tar.gz" quiet="true" />
413 - <antcall target="trydownload">
414 - <param name="sourcefile" value="${sourcefile.1}" />
415 - <param name="destfile" value="${base.path}/file.tar.gz" />
417 - <antcall target="trydownload">
418 - <param name="sourcefile" value="${sourcefile.2}" />
419 - <param name="destfile" value="${base.path}/file.tar.gz" />
421 - <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
422 - <untar src="${base.path}/file.tar" dest="${base.path}"/>
423 - <delete file="${base.path}/file.tar"/>
424 - <delete file="${base.path}/file.tar.gz"/>
427 - <target name="downloadzip" unless="exist" depends="setproxy,testexist">
428 - <!-- Download and extract the package -->
429 - <get src="${sourcefile}" dest="${base.path}/file.zip" />
430 - <mkdir dir="${destdir}" />
431 - <unzip src="${base.path}/file.zip" dest="${destdir}"/>
432 - <delete file="${base.path}/file.zip"/>
435 - <target name="downloadzip-2" unless="exist" depends="testexist">
436 - <!-- Download and extract the package from the two alternative locations -->
437 - <delete file="${base.path}/file.zip" quiet="true" />
438 - <antcall target="trydownload">
439 - <param name="sourcefile" value="${sourcefile.1}" />
440 - <param name="destfile" value="${base.path}/file.zip" />
442 - <antcall target="trydownload">
443 - <param name="sourcefile" value="${sourcefile.2}" />
444 - <param name="destfile" value="${base.path}/file.zip" />
446 - <mkdir dir="${destdir}" />
447 - <unzip src="${base.path}/file.zip" dest="${destdir}"/>
448 - <delete file="${base.path}/file.zip"/>
451 - <target name="downloadfile" unless="exist" depends="setproxy,testexist">
452 - <!-- Download extract the file -->
453 - <mkdir dir="${destdir}" />
454 - <get src="${sourcefile}" dest="${destfile}" />
457 - <target name="downloadfile-2" unless="exist" depends="testexist">
458 - <!-- Download the file from the two alternative locations -->
459 - <mkdir dir="${destdir}" />
461 - <antcall target="trydownload">
462 - <param name="sourcefile" value="${sourcefile.1}" />
465 - <antcall target="trydownload">
466 - <param name="sourcefile" value="${sourcefile.2}" />
469 - <available file="${destfile}" property="exist"/>
470 - <fail unless="exist" message="Failed to download [${destfile}]. All download sources are unavailable." />
473 - <target name="trydownload.check" depends="setproxy">
474 - <condition property="trydownload.run">
477 - <available file="${destfile}" />
479 - <http url="${sourcefile}" />
484 - <target name="trydownload" if="trydownload.run" depends="trydownload.check">
485 - <!-- Downloads a file if not yet downloaded and the source URL is available -->
486 - <get src="${sourcefile}" dest="${destfile}" />
489 - <!-- ============================ IDE Support ============================ -->
491 - <target name="ide-eclipse" depends="deploy, extras-webservices-prepare"
492 - description="Prepares the source tree to be built in Eclipse">
494 - <!-- Copy the sample project files into the root directory -->
495 - <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
496 - <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.classpath" tofile="${tomcat.home}/.classpath"/>
498 - <echo>Eclipse project files created.
499 -Read the Building page on the Apache Tomcat documentation site for details on how to configure your Eclipse workplace.</echo>
502 <!-- ======================= Macros, Taskdefs etc ======================== -->
504 <macrodef name="jarIt" description="utility macro for standard JAR packaging">