bodewig 2004/12/21 06:09:39
Modified: . Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs/optional/net Tag:
ANT_16_BRANCH SetProxy.java
Log:
merge
Revision Changes Path
No revision
No revision
1.503.2.153 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.152
retrieving revision 1.503.2.153
diff -u -r1.503.2.152 -r1.503.2.153
--- WHATSNEW 21 Dec 2004 13:41:40 -0000 1.503.2.152
+++ WHATSNEW 21 Dec 2004 14:09:39 -0000 1.503.2.153
@@ -106,6 +106,9 @@
* <scp> using <fileset> didn't work with OpenSSH 3.9 and later.
Bugzilla report 31939
+* <setproxy> failed to set user/password on some JDKs.
+ Bugzilla report 32667
+
Changes from Ant 1.6.1 to Ant 1.6.2
===================================
No revision
No revision
1.17.2.6 +25 -0
ant/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
Index: SetProxy.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -u -r1.17.2.5 -r1.17.2.6
--- SetProxy.java 9 Mar 2004 17:01:51 -0000 1.17.2.5
+++ SetProxy.java 21 Dec 2004 14:09:39 -0000 1.17.2.6
@@ -18,6 +18,8 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.net.Authenticator;
+import java.net.PasswordAuthentication;
import java.util.Properties;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -236,6 +238,15 @@
&& JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)) {
legacyResetProxySettingsCall(enablingProxy);
}
+
+ if (proxyUser != null) {
+ if (enablingProxy) {
+ Authenticator.setDefault(new ProxyAuth(proxyUser,
+ proxyPassword));
+ } else if (settingsChanged) {
+ Authenticator.setDefault(new ProxyAuth("", ""));
+ }
+ }
}
/**
@@ -284,5 +295,19 @@
applyWebProxySettings();
}
+ /**
+ * @since 1.6.3
+ */
+ private static final class ProxyAuth extends Authenticator {
+ private PasswordAuthentication auth;
+
+ private ProxyAuth(String user, String pass) {
+ auth = new PasswordAuthentication(user, pass.toCharArray());
+ }
+
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return auth;
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
