summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2013-10-27 07:53:03 +0000
committerMiroslav Šulc <fordfrog@gentoo.org>2013-10-27 07:53:03 +0000
commit6dc9a6220496bb21c388b97186f3dc73d993fb31 (patch)
tree11e009457206928d3298b65fff5803701bb2a741 /www-servers
parentwww-servers/tomcat: version bump (diff)
downloadhistorical-6dc9a6220496bb21c388b97186f3dc73d993fb31.tar.gz
historical-6dc9a6220496bb21c388b97186f3dc73d993fb31.tar.bz2
historical-6dc9a6220496bb21c388b97186f3dc73d993fb31.zip
www-servers/tomcat: removed obsolete files
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0xCFE47E2F
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/tomcat/ChangeLog7
-rw-r--r--www-servers/tomcat/Manifest6
-rw-r--r--www-servers/tomcat/files/tomcat-6.0.36-build.xml.patch31
-rw-r--r--www-servers/tomcat/files/tomcat-7.0.32-build.xml.patch105
-rw-r--r--www-servers/tomcat/files/tomcat-7.0.39-build.xml.patch105
-rw-r--r--www-servers/tomcat/files/tomcat-7.0.41-build.xml.patch105
6 files changed, 7 insertions, 352 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 6799c75a55b1..555a996c0763 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.325 2013/10/27 07:50:48 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.326 2013/10/27 07:52:55 fordfrog Exp $
+
+ 27 Oct 2013; Miroslav Šulc <fordfrog@gentoo.org>
+ -files/tomcat-6.0.36-build.xml.patch, -files/tomcat-7.0.32-build.xml.patch,
+ -files/tomcat-7.0.39-build.xml.patch, -files/tomcat-7.0.41-build.xml.patch:
+ removed obsolete files
*tomcat-7.0.47 (27 Oct 2013)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index d81716b614af..19dd9e571adf 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,8 +1,4 @@
-AUX tomcat-6.0.36-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169b530b61dab3f1f01a094ec22e3f9f SHA512 69775288f3ba31bc5b3f1f6125c1ca6f27c64647eeeb40928227fcbeb3a33f832ccc24be051efec9f8ca575475549c6493b12495d4a98e9e4fd1c27b9af68f8c WHIRLPOOL e31b35c1395c152c65863cddd79617ec92b21269567fc1458914e6f9b10e3a70698987d05724e52b706e6e0cfeab56e818feca5d04d80ee08f24bfefe89ea63f
AUX tomcat-6.0.37-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169b530b61dab3f1f01a094ec22e3f9f SHA512 69775288f3ba31bc5b3f1f6125c1ca6f27c64647eeeb40928227fcbeb3a33f832ccc24be051efec9f8ca575475549c6493b12495d4a98e9e4fd1c27b9af68f8c WHIRLPOOL e31b35c1395c152c65863cddd79617ec92b21269567fc1458914e6f9b10e3a70698987d05724e52b706e6e0cfeab56e818feca5d04d80ee08f24bfefe89ea63f
-AUX tomcat-7.0.32-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
-AUX tomcat-7.0.39-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
-AUX tomcat-7.0.41-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
AUX tomcat-7.0.42-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
AUX tomcat-7.0.47-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
AUX tomcat-instance-manager.bash 6403 SHA256 09ff73a51d6f11b83c78d6306322455091da302c8d6bd711a0fa4983d850dab4 SHA512 7b51b77447854dd4c6fd4a3bc16aa912edcb5e31d64a4c47f24102c3fc29c2a18f51d8b8f0e28723fba694451c8ab780dcac3d12dc553dc3f182c1d1372e7171 WHIRLPOOL ad845aedd608615df243722be6a4e3ad477890ee8e59b5d0061c4490d95058d7857346bf545c16d7756ecfa62a0b31f137d819095461cb6180cc75df1d81511d
@@ -14,5 +10,5 @@ DIST apache-tomcat-7.0.47-src.tar.gz 4568824 SHA256 be7cad1c70b9db84e8b139a81312
EBUILD tomcat-6.0.37.ebuild 3955 SHA256 f3fe3d65df373b2ac6e09bd6fb78d4dcd91342ad9607aae3c9962df1991b1fed SHA512 ebdd8d788084048b09b73c68affa5c9c4c372d0114390936f20f9f75d846e38a38d6a1694e33d75ff04de3512992b6d31177b77566bc4892c1a6e15a9a6399df WHIRLPOOL 1d3edfb6b7a34b4810ac2d75b4eea4acf814b694246948ebf6548f2aabfc26d389a711418ff98a1771361ce608d9eaf782bf38ff7ac6d96d420092b9f56e2aa9
EBUILD tomcat-7.0.42.ebuild 4036 SHA256 c717c7d67b0ba3931c848057980a10a7897db8d6b5e1ea975f3daef321546290 SHA512 55ddd1823146d6cce2e19ed71bdd36cc778f276c01eb699147744fef0378f4ac1f6c2e357b823274d0ac42887af4f83c832306ffa09e2740ccd1f97589251669 WHIRLPOOL b6d7ee5c22d8e89903ca0f6b99ecf78c72eccb6a788f36d37c672edef9f0d3c92f585a02877653b3ca2b8dcb6fb606f76f26466d852e955e3ec4aaa621e1a378
EBUILD tomcat-7.0.47.ebuild 4047 SHA256 fd45a575e61eada7d36e7b6f4b93435d4684093efe1d8fe7e5871bcd300bc1c2 SHA512 0ac833f9e80b6fea175c4894df53ffeb1c2930e54dbfdb506e86e3b28ec36698d1d3d907fe11d97c71b70ceb36a4ccd236851519e1e0834bde9c3dffe95350f0 WHIRLPOOL 6d5184b23115b7d2d89621aa72eca2e411d5e8362179ef0fea8ac702acf986142ea5a0361d6f7fad6b8b51848fa5edd165a48726e08d487eea92a43062d21ccf
-MISC ChangeLog 77936 SHA256 a3498447b242525b167f7139cdb6d8c7f806b91ed733950f20cffaaf20de2935 SHA512 7a74e2b1a15de3e8e506ab09ae933c161e65fd10cb701d56881830c4331776e840c083f01027f663632081cc0c7dbc6e149d650fec47ee669cfbc968881b5830 WHIRLPOOL 7ac17fcaca02adacd0342829136dc6c2b55646dc095e0a3dbdd24210b67f2266e6e0fb52659f22bda7e0d5a364fdb3ca3c30c052f9adcc0656ecd331e507e75c
+MISC ChangeLog 78170 SHA256 113733c395044ccc47a2b60722984c130ce8037285672cc553bab0ec03df8593 SHA512 3edfa0af098d7ac0c5b981a246dd8e0b9f48d5d7ea605f4310487bc97a5f1239cfbe39760ec3526fd4749bcfae9d3097443bf33df0d213af6ff0341c8a5e9028 WHIRLPOOL cc86833c577738f3265bb771c61945891db6e0b979445299c9c034bd2837c4db8c008c1f83de7cc1a2283c1291837afd0fa6725f6dd59e514c477e078f1a4f25
MISC metadata.xml 561 SHA256 a53b91aa1c4371952ed465d0b570fde6eebd1a621804990aa3d2c31f3a8cecab SHA512 354849871d8ff7e9d3bba1bd412f78789693518f1f9804aac412b64e9e86622fb86080b8290bbe16424c760b3601e96824cb3f0b956edbc2245dfa5be299c8c5 WHIRLPOOL f740fcc281807c913934662fcff48a023d42065ec0b50564d4a12ff970ce09447cac0a71016a33ff4896a596dcd86cd9372b4a12286fb0bf46bb01bb6bd2c7e1
diff --git a/www-servers/tomcat/files/tomcat-6.0.36-build.xml.patch b/www-servers/tomcat/files/tomcat-6.0.36-build.xml.patch
deleted file mode 100644
index 6517dee4d196..000000000000
--- a/www-servers/tomcat/files/tomcat-6.0.36-build.xml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- build.xml.orig 2012-07-06 20:26:21.361299240 +0200
-+++ build.xml 2012-07-06 20:26:56.085899911 +0200
-@@ -487,12 +487,14 @@
-
- <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}" />
-+-->
-
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
---- build.xml.orig 2012-07-06 20:31:31.387806167 +0200
-+++ build.xml 2012-07-06 20:32:33.185315885 +0200
-@@ -646,9 +646,11 @@
- </fileset>
- </txt2html>
-
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
-+-->
-
- </target>
-
diff --git a/www-servers/tomcat/files/tomcat-7.0.32-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.32-build.xml.patch
deleted file mode 100644
index 9b07137451aa..000000000000
--- a/www-servers/tomcat/files/tomcat-7.0.32-build.xml.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 3ff8f81..83357a4 100644
---- a/build.xml
-+++ b/build.xml
-@@ -613,7 +614,8 @@
- filesId="files.annotations-api"
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
-- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
-+ Servlet 3.0 Implementation JAR File
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
-@@ -621,7 +623,7 @@
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-
-- <!-- JSP 2.2 Implementation JAR File -->
-+ JSP 2.2 Implementation JAR File
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
-@@ -629,11 +631,12 @@
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-
-- <!-- JSP 2.2 EL Implementation JAR File -->
-+ JSP 2.2 EL Implementation JAR File
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -834,13 +837,14 @@
- <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">
-@@ -918,9 +922,11 @@
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
-+-->
-
- <!-- build the jdbc-pool jar and source jar-->
- <echo message="Building Tomcat JDBC pool libraries"/>
-@@ -1355,7 +1361,8 @@
-
- <target name="extras-webservices-prepare"
- depends="extras-prepare"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package"
-+ unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -2278,7 +2285,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- </target>
-
- <target name="download-compile"
-- description="Download (and build) components necessary to compile" >
-+ description="Download (and build) components necessary to compile"
-+ unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2335,7 +2343,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests"
-+ unless="noget">
-
- <antcall target="downloadzip">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2346,7 +2355,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution"
-+ unless="noget">
-
- <antcall target="downloadzip-2">
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
diff --git a/www-servers/tomcat/files/tomcat-7.0.39-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.39-build.xml.patch
deleted file mode 100644
index 9b07137451aa..000000000000
--- a/www-servers/tomcat/files/tomcat-7.0.39-build.xml.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 3ff8f81..83357a4 100644
---- a/build.xml
-+++ b/build.xml
-@@ -613,7 +614,8 @@
- filesId="files.annotations-api"
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
-- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
-+ Servlet 3.0 Implementation JAR File
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
-@@ -621,7 +623,7 @@
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-
-- <!-- JSP 2.2 Implementation JAR File -->
-+ JSP 2.2 Implementation JAR File
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
-@@ -629,11 +631,12 @@
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-
-- <!-- JSP 2.2 EL Implementation JAR File -->
-+ JSP 2.2 EL Implementation JAR File
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -834,13 +837,14 @@
- <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">
-@@ -918,9 +922,11 @@
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
-+-->
-
- <!-- build the jdbc-pool jar and source jar-->
- <echo message="Building Tomcat JDBC pool libraries"/>
-@@ -1355,7 +1361,8 @@
-
- <target name="extras-webservices-prepare"
- depends="extras-prepare"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package"
-+ unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -2278,7 +2285,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- </target>
-
- <target name="download-compile"
-- description="Download (and build) components necessary to compile" >
-+ description="Download (and build) components necessary to compile"
-+ unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2335,7 +2343,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests"
-+ unless="noget">
-
- <antcall target="downloadzip">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2346,7 +2355,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution"
-+ unless="noget">
-
- <antcall target="downloadzip-2">
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
diff --git a/www-servers/tomcat/files/tomcat-7.0.41-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.41-build.xml.patch
deleted file mode 100644
index 9b07137451aa..000000000000
--- a/www-servers/tomcat/files/tomcat-7.0.41-build.xml.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 3ff8f81..83357a4 100644
---- a/build.xml
-+++ b/build.xml
-@@ -613,7 +614,8 @@
- filesId="files.annotations-api"
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
-- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
-+ Servlet 3.0 Implementation JAR File
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
-@@ -621,7 +623,7 @@
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-
-- <!-- JSP 2.2 Implementation JAR File -->
-+ JSP 2.2 Implementation JAR File
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
-@@ -629,11 +631,12 @@
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-
-- <!-- JSP 2.2 EL Implementation JAR File -->
-+ JSP 2.2 EL Implementation JAR File
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -834,13 +837,14 @@
- <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">
-@@ -918,9 +922,11 @@
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
-+-->
-
- <!-- build the jdbc-pool jar and source jar-->
- <echo message="Building Tomcat JDBC pool libraries"/>
-@@ -1355,7 +1361,8 @@
-
- <target name="extras-webservices-prepare"
- depends="extras-prepare"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package"
-+ unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -2278,7 +2285,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- </target>
-
- <target name="download-compile"
-- description="Download (and build) components necessary to compile" >
-+ description="Download (and build) components necessary to compile"
-+ unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2335,7 +2343,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests"
-+ unless="noget">
-
- <antcall target="downloadzip">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2346,7 +2355,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution"
-+ unless="noget">
-
- <antcall target="downloadzip-2">
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/>