Author: ningjiang
Date: Fri Nov 6 03:22:17 2009
New Revision: 833289
URL: http://svn.apache.org/viewvc?rev=833289&view=rev
Log:
CAMEL-2138 applied patch with thanks to Stan
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java?rev=833289&r1=833288&r2=833289&view=diff
==============================================================================
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java
(original)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java
Fri Nov 6 03:22:17 2009
@@ -18,20 +18,22 @@
import org.apache.commons.httpclient.Credentials;
import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.NTCredentials;
import org.apache.commons.httpclient.auth.AuthScope;
public class BasicAuthenticationHttpClientConfigurer implements
HttpClientConfigurer {
private final String username;
private final String password;
+ private final String domain;
- public BasicAuthenticationHttpClientConfigurer(String user, String pwd) {
+ public BasicAuthenticationHttpClientConfigurer(String user, String pwd,
String domain) {
username = user;
password = pwd;
+ this.domain = domain;
}
public void configureHttpClient(HttpClient client) {
- Credentials defaultcreds = new UsernamePasswordCredentials(username,
password);
+ Credentials defaultcreds = new NTCredentials(username, password, null,
domain);
client.getState().setCredentials(AuthScope.ANY, defaultcreds);
}
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java?rev=833289&r1=833288&r2=833289&view=diff
==============================================================================
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
(original)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
Fri Nov 6 03:22:17 2009
@@ -82,10 +82,11 @@
// check the user name and password for basic authentication
String username = getAndRemoveParameter(parameters, "username",
String.class);
String password = getAndRemoveParameter(parameters, "password",
String.class);
+ String domain = getAndRemoveParameter(parameters, "domain",
String.class);
if (username != null && password != null) {
httpClientConfigurer = CompositeHttpConfigurer.combineConfigurers(
httpClientConfigurer,
- new BasicAuthenticationHttpClientConfigurer(username,
password));
+ new BasicAuthenticationHttpClientConfigurer(username,
password, domain));
}
// check the proxy details for proxy configuration
@@ -94,9 +95,10 @@
if (host != null && port != null) {
String proxyUsername = getAndRemoveParameter(parameters,
"proxyUsername", String.class);
String proxyPassword = getAndRemoveParameter(parameters,
"proxyPassword", String.class);
+ String proxyDomain = getAndRemoveParameter(parameters,
"proxyDomain", String.class);
if (proxyUsername != null && proxyPassword != null) {
httpClientConfigurer =
CompositeHttpConfigurer.combineConfigurers(
- httpClientConfigurer, new ProxyHttpClientConfigurer(host,
port, proxyUsername, proxyPassword));
+ httpClientConfigurer, new ProxyHttpClientConfigurer(host,
port, proxyUsername, proxyPassword, proxyDomain));
} else {
httpClientConfigurer =
CompositeHttpConfigurer.combineConfigurers(
httpClientConfigurer, new ProxyHttpClientConfigurer(host,
port));
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java?rev=833289&r1=833288&r2=833289&view=diff
==============================================================================
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java
(original)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java
Fri Nov 6 03:22:17 2009
@@ -18,7 +18,7 @@
import org.apache.commons.httpclient.Credentials;
import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.NTCredentials;
import org.apache.commons.httpclient.auth.AuthScope;
/**
@@ -33,23 +33,25 @@
private final String username;
private final String password;
+ private final String domain;
public ProxyHttpClientConfigurer(String host, Integer port) {
- this(host, port, null, null);
+ this(host, port, null, null, null);
}
- public ProxyHttpClientConfigurer(String host, Integer port, String
username, String password) {
+ public ProxyHttpClientConfigurer(String host, Integer port, String
username, String password, String domain) {
this.host = host;
this.port = port;
this.username = username;
this.password = password;
+ this.domain = domain;
}
public void configureHttpClient(HttpClient client) {
client.getHostConfiguration().setProxy(host, port);
if (username != null && password != null) {
- Credentials defaultcreds = new
UsernamePasswordCredentials(username, password);
+ Credentials defaultcreds = new NTCredentials(username, password,
null, domain);
client.getState().setProxyCredentials(AuthScope.ANY, defaultcreds);
}
}
