Author: markt Date: Mon Feb 10 18:18:12 2014 New Revision: 1566695 URL: http://svn.apache.org/r1566695 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/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/build.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1566693 Modified: tomcat/tc7.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1566695&r1=1566694&r2=1566695&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Mon Feb 10 18:18:12 2014 @@ -53,6 +53,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/tc7.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1566695&r1=1566694&r2=1566695&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/build.xml (original) +++ tomcat/tc7.0.x/trunk/build.xml Mon Feb 10 18:18:12 2014 @@ -2809,7 +2809,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"/> @@ -2836,7 +2836,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"/> @@ -2861,7 +2861,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"> @@ -2893,7 +2893,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/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1566695&r1=1566694&r2=1566695&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Feb 10 18:18:12 2014 @@ -312,6 +312,11 @@ Content-Type header and multipart request processing. Fixed by merging latest code (r1565163) from Commons FileUpload. (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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org