Author: kkolinko
Date: Fri Jun 27 15:32:32 2014
New Revision: 1606128
URL: http://svn.apache.org/r1606128
Log:
Simplify "setproxy" target.
The "proxy.use" flag can now be "on", "yes" or "true", so document "true" as
the recommended value.
The property expansion feature for if/unless attributes is since Ant 1.8.0.
Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1606128&r1=1606127&r2=1606128&view=diff
==============================================================================
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Fri Jun 27 15:32:32 2014
@@ -144,7 +144,7 @@ ${tomcat.source}.
The following properties should be added to the
${tomcat.source}/build.properties
file.
- proxy.use=on
+ proxy.use=true
proxy.host=proxy.domain
proxy.port=8080
proxy.user=username
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1606128&r1=1606127&r2=1606128&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Jun 27 15:32:32 2014
@@ -2758,14 +2758,7 @@ Apache Tomcat ${version} native binaries
<!-- =============== 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">
+ <target name="setproxy" if="${proxy.use}">
<taskdef name="setproxy"
classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
@@ -2778,7 +2771,7 @@ Apache Tomcat ${version} native binaries
<available file="${destfile}" property="exist"/>
</target>
- <target name="downloadgz" unless="exist" depends="setproxy,testexist">
+ <target name="downloadgz" unless="exist" depends="testexist,setproxy">
<!-- 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"/>
@@ -2805,7 +2798,7 @@ Apache Tomcat ${version} native binaries
<delete file="${base.path}/file.tar.gz"/>
</target>
- <target name="downloadzip" unless="exist" depends="setproxy,testexist">
+ <target name="downloadzip" unless="exist" depends="testexist,setproxy">
<!-- Download and extract the package -->
<get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}"
dest="${base.path}/file.zip" />
<mkdir dir="${destdir}" />
@@ -2829,7 +2822,7 @@ Apache Tomcat ${version} native binaries
<delete file="${base.path}/file.zip"/>
</target>
- <target name="downloadfile" unless="exist" depends="setproxy,testexist">
+ <target name="downloadfile" unless="exist" depends="testexist,setproxy">
<!-- Download extract the file -->
<mkdir dir="${destdir}" />
<get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}"
dest="${destfile}" />
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1606128&r1=1606127&r2=1606128&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun 27 15:32:32 2014
@@ -130,6 +130,10 @@
updated, it will delete the old JAR from <code>build/lib</code>
directory. (kkolinko)
</update>
+ <scode>
+ Simplify implementation of "setproxy" target in <code>build.xml</code>.
+ (kkolinko)
+ </scode>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
