diff --git a/docs/manual/OptionalTasks/setproxy.html b/docs/manual/OptionalTasks/setproxy.html index 2e1c6e0af..1d9b9f8da 100644 --- a/docs/manual/OptionalTasks/setproxy.html +++ b/docs/manual/OptionalTasks/setproxy.html @@ -46,40 +46,24 @@
- Sets Java's web proxy properties, so that tasks and code run in - the same JVM can have through-the-firewall access to remote web sites, - and remote ftp sites. - You can nominate an http and ftp proxy, or a socks server, reset the server - settings, or do nothing at all. -

- Examples - 

<setproxy/>
- do nothing - 
<setproxy proxyhost="firewall"/>
- set the proxy to firewall:80 - 
<setproxy proxyhost="firewall" proxyport="81"/>
- set the proxy to firewall:81 - 
<setproxy proxyhost=""/>
- stop using the http proxy; don't change the socks settings - 
<setproxy socksproxyhost="socksy"/>
- use socks via socksy:1080 - 
<setproxy socksproxyhost=""/>
- stop using the socks server + Sets Java's web proxy properties, so that tasks and code run in the same JVM can have through-the-firewall access to remote web sites, and remote ftp sites. You can nominate an http and ftp proxy, or a socks server, reset the server settings, or do nothing at all.

Examples 

<setproxy/>
do nothing 
<setproxy proxyhost="firewall"/>
set the proxy to firewall:80 
<setproxy proxyhost="firewall" proxyport="81"/>
set the proxy to firewall:81 
<setproxy proxyhost=""/>
stop using the http proxy; don't change the socks settings 
<setproxy socksproxyhost="socksy"/>
use socks via socksy:1080 
<setproxy socksproxyhost=""/>
stop using the socks server.

You can set a username and password for http with the proxyHost and proxyPassword attributes. On Java1.4 and above these can also be used against SOCKS5 servers.

+ + + + - - @@ -239,7 +211,7 @@ diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java index 38113915a..5f19e38ae 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java @@ -80,12 +80,12 @@ import org.apache.tools.ant.util.JavaEnvUtils; * 
<setproxy socksproxyhost="socksy"/>
* use socks via socksy:1080 * 
<setproxy socksproxyhost=""/>
- * stop using the socks server + * stop using the socks server. + *

* You can set a username and password for http with the proxyHost * and proxyPassword attributes. On Java1.4 and above these can also be * used against SOCKS5 servers. - - + *

* @see * java 1.4 network property list * @author Steve Loughran
 
Parameters
@@ -91,35 +75,36 @@ + - + + + + + +
Type + + Requirement
- nonProxyHosts + nonproxyhosts - - A list of hosts to bypass the proxy on. These should be separated - with the vertical bar character '|'. Only in Java 1.4 does ftp use - this list. - e.g. fozbot.corp.sun.com|*.eng.sun.com. - + A list of hosts to bypass the proxy on. These should be separated with the vertical bar character '|'. Only in Java 1.4 does ftp use this list. e.g. fozbot.corp.sun.com|*.eng.sun.com String + Optional +
- proxyHost + proxyhost - - the HTTP/ftp proxy host. Set this to "" for the http proxy - option to be disabled - + the HTTP/ftp proxy host. Set this to "" for the http proxy option to be disabled String @@ -128,13 +113,10 @@
- proxyPassword + proxypassword - - Set the password for the proxy. Used only if the proxyUser is set.
- since Ant 1.6 - + Set the password for the proxy. Used only if the proxyUser is set. 		String @@ -143,12 +125,10 @@
- proxyPort + proxyport - - the HTTP/ftp proxy port number; default is 80 - + the HTTP/ftp proxy port number; default is 80 int @@ -157,14 +137,10 @@
- proxyUser + proxyuser - - set the proxy user. Probably requires a password to accompany this - setting. Default=""
- since Ant 1.6 - + set the proxy user. Probably requires a password to accompany this setting. Default="" 		String @@ -173,13 +149,10 @@
- socksProxyHost + socksproxyhost - - The name of a Socks server. Set to "" to turn socks - proxying off. - + The name of a Socks server. Set to "" to turn socks proxying off. String @@ -188,18 +161,17 @@
- socksProxyPort + socksproxyport - - Set the ProxyPort for socks connections. The default value is 1080 - + Set the ProxyPort for socks connections. The default value is 1080 int
- Copyright © 2002-2003, Apache Software Foundation + Copyright © 2000-2003, Apache Software Foundation