Author: markt
Date: Mon Feb 10 18:15:49 2014
New Revision: 1566693
URL: http://svn.apache.org/r1566693
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56115
Expose the httpusecaches property of Ant's get task as some users may need to
change the default.
Based on a suggestion by Anthony.
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1566693&r1=1566692&r2=1566693&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Feb 10 18:15:49 2014
@@ -50,6 +50,9 @@ test.jvmarg.egd=-Djava.security.egd=file
# Location of GPG executable (used only for releases)
gpg.exec=/path/to/gpg
+# ----- Settings to use when downloading files -----
+trydownload.usehttpcaches=true
+
# ----- Default Base Path for Dependent Packages -----
# Please note this path must be absolute, not relative,
# as it is referenced with different working directory
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1566693&r1=1566692&r2=1566693&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Feb 10 18:15:49 2014
@@ -2824,7 +2824,7 @@ Apache Tomcat ${version} native binaries
<target name="downloadgz" unless="exist" depends="setproxy,testexist">
<!-- Download and extract the package -->
- <get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
+ <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"/>
@@ -2851,7 +2851,7 @@ Apache Tomcat ${version} native binaries
<target name="downloadzip" unless="exist" depends="setproxy,testexist">
<!-- Download and extract the package -->
- <get src="${sourcefile}" dest="${base.path}/file.zip" />
+ <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"/>
@@ -2876,7 +2876,7 @@ Apache Tomcat ${version} native binaries
<target name="downloadfile" unless="exist" depends="setproxy,testexist">
<!-- Download extract the file -->
<mkdir dir="${destdir}" />
- <get src="${sourcefile}" dest="${destfile}" />
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}"
dest="${destfile}" />
</target>
<target name="downloadfile-2" unless="exist" depends="testexist">
@@ -2908,7 +2908,7 @@ Apache Tomcat ${version} native binaries
<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}" />
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}"
dest="${destfile}" />
</target>
<!-- ============================ IDE Support ============================
-->
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1566693&r1=1566692&r2=1566693&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb 10 18:15:49 2014
@@ -67,6 +67,11 @@
<code>tomcat8.exe</code> is called, a UAC dialog is displayed if UAC is
enabled. (markt)
</fix>
+ <fix>
+ <bug>56115</bug>: Expose the <code>httpusecaches</code> property of
+ Ant's <code>get</code> task as some users may need to change the
+ default. Based on a suggestion by Anthony. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
