You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2006/09/13 19:20:30 UTC
svn commit: r443035 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http:
AbstractHTTPSender.java HTTPCredentialProvider.java
Author: saminda
Date: Wed Sep 13 10:20:30 2006
New Revision: 443035
URL: http://svn.apache.org/viewvc?view=rev&rev=443035
Log:
1. Fixing the Logic wrt information provided by commons-httpclient devs.
Removed:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPCredentialProvider.java
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java?view=diff&rev=443035&r1=443034&r2=443035
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java Wed Sep 13 10:20:30 2006
@@ -30,7 +30,6 @@
import org.apache.axis2.util.Utils;
import org.apache.commons.httpclient.*;
import org.apache.commons.httpclient.auth.AuthScope;
-import org.apache.commons.httpclient.auth.CredentialsProvider;
import org.apache.commons.httpclient.methods.RequestEntity;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -340,12 +339,27 @@
if (obj != null) {
if (obj instanceof HttpTransportProperties.Authenticator) {
authenticator = (HttpTransportProperties.Authenticator) obj;
- agent.getParams().setParameter(
- CredentialsProvider.PROVIDER,
- new HTTPCredentialProvider(authenticator.getHost(),
- authenticator.getRealm(),
- authenticator.getUsername(),
- authenticator.getPassword()));
+ String username = authenticator.getUsername();
+ String password = authenticator.getPassword();
+ String host = authenticator.getHost();
+ String realm = authenticator.getRealm();
+ int port = authenticator.getPort();
+
+ Credentials creds;
+
+ if (host == null && realm == null && port == -1) {
+ creds = new UsernamePasswordCredentials(username,password);
+ agent.getState().setCredentials(new AuthScope(AuthScope.ANY), creds);
+ } else if (host != null && port == -1 && realm != null) {
+ creds = new NTCredentials(username, password, host, realm);
+ agent.getState().setCredentials(new AuthScope(host, AuthScope.ANY_PORT), creds);
+ } else if (host != null && port > -1 && realm != null) {
+ creds = new NTCredentials(username, password, host, realm);
+ agent.getState().setCredentials(new AuthScope(host, port, realm), creds);
+ } else {
+ throw new AxisFault("Credential setting is not valid");
+ }
+
} else {
throw new AxisFault("HttpTransportProperties.Authenticator class cast exception");
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org