Add proxy user/pass to setproxy

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@527691 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index f407f64..fe62bc3 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -533,7 +533,8 @@
   <target name="setproxy" depends="proxyflags" if="useproxy">
     <taskdef name="setproxy"
             classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
-    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+              proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
   </target>
 

diff --git a/extras.xml b/extras.xml
index cf00875..5e3e761 100644 (file)
--- a/extras.xml
+++ b/extras.xml
@@ -212,7 +212,8 @@
   <target name="setproxy" depends="proxyflags" if="useproxy">
     <taskdef name="setproxy"
             classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
-    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+              proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
   </target>