svn commit: r833364 - in /camel/branches/camel-1.x: ./ components/camel-http/src/main/java/org/apache/camel/component/http/

View: New views

1 Messages — Rating Filter: Alert me

svn commit: r833364 - in /camel/branches/camel-1.x: ./ components/camel-http/src/main/java/org/apache/camel/component/http/

by ningjiang :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Author: ningjiang
Date: Fri Nov 6 11:54:50 2009
New Revision: 833364

URL: http://svn.apache.org/viewvc?rev=833364&view=rev
Log:
Merged revisions 833350 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk

........
r833350 | ningjiang | 2009-11-06 19:24:26 +0800 (Fri, 06 Nov 2009) | 1 line

CAMEL-2138 quick fix the NTCredential, and introduce host ,and proxyNtHost options for the NTCredential
........

Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java
camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 6 11:54:50 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819483,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,826977,828288,828333,829900,830052,830493,832647,833285,833289
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819483,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,826977,828288,828333,829900,830052,830493,832647,833285,833289,833350

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java?rev=833364&r1=833363&r2=833364&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java (original)
+++ camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java Fri Nov 6 11:54:50 2009
@@ -19,21 +19,29 @@
import org.apache.commons.httpclient.Credentials;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.NTCredentials;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.auth.AuthScope;

public class BasicAuthenticationHttpClientConfigurer implements HttpClientConfigurer {
private final String username;
private final String password;
private final String domain;
+ private final String host;

- public BasicAuthenticationHttpClientConfigurer(String user, String pwd, String domain) {
+ public BasicAuthenticationHttpClientConfigurer(String user, String pwd, String domain, String host) {
username = user;
password = pwd;
this.domain = domain;
+ this.host = host;
}

public void configureHttpClient(HttpClient client) {
- Credentials defaultcreds = new NTCredentials(username, password, null, domain);
+ Credentials defaultcreds;
+ if (domain != null) {
+ defaultcreds = new NTCredentials(username, password, host, domain);
+ } else {
+ defaultcreds = new UsernamePasswordCredentials(username, password);
+ }
client.getState().setCredentials(AuthScope.ANY, defaultcreds);
}

Modified: camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java?rev=833364&r1=833363&r2=833364&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java (original)
+++ camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java Fri Nov 6 11:54:50 2009
@@ -90,26 +90,28 @@
String username = getAndRemoveParameter(parameters, "username", String.class);
String password = getAndRemoveParameter(parameters, "password", String.class);
String domain = getAndRemoveParameter(parameters, "domain", String.class);
+ String host = getAndRemoveParameter(parameters, "host", String.class);
if (username != null && password != null) {

httpClientConfigurer = CompositeHttpConfigurer.combineConfigurers(
httpClientConfigurer,
- new BasicAuthenticationHttpClientConfigurer(username, password, domain));
+ new BasicAuthenticationHttpClientConfigurer(username, password, domain, host));
}

// check the proxy details for proxy configuration
- String host = getAndRemoveParameter(parameters, "proxyHost", String.class);
- Integer port = getAndRemoveParameter(parameters, "proxyPort", Integer.class);
- if (host != null && port != null) {
+ String proxyHost = getAndRemoveParameter(parameters, "proxyHost", String.class);
+ Integer proxyPort = getAndRemoveParameter(parameters, "proxyPort", Integer.class);
+ if (proxyHost != null && proxyPort != null) {
String proxyUsername = getAndRemoveParameter(parameters, "proxyUsername", String.class);
String proxyPassword = getAndRemoveParameter(parameters, "proxyPassword", String.class);
String proxyDomain = getAndRemoveParameter(parameters, "proxyDomain", String.class);
+ String proxyNtHost = getAndRemoveParameter(parameters, "proxyNtHost", String.class);
if (proxyUsername != null && proxyPassword != null) {
httpClientConfigurer = CompositeHttpConfigurer.combineConfigurers(
- httpClientConfigurer, new ProxyHttpClientConfigurer(host, port, proxyUsername, proxyPassword, proxyDomain));
+ httpClientConfigurer, new ProxyHttpClientConfigurer(proxyHost, proxyPort, proxyUsername, proxyPassword, proxyDomain, proxyNtHost));
} else {
httpClientConfigurer = CompositeHttpConfigurer.combineConfigurers(
- httpClientConfigurer, new ProxyHttpClientConfigurer(host, port));
+ httpClientConfigurer, new ProxyHttpClientConfigurer(proxyHost, proxyPort));
}
}
}

Modified: camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java?rev=833364&r1=833363&r2=833364&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java (original)
+++ camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java Fri Nov 6 11:54:50 2009
@@ -19,6 +19,7 @@
import org.apache.commons.httpclient.Credentials;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.NTCredentials;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.auth.AuthScope;

/**
@@ -34,24 +35,31 @@
private final String username;
private final String password;
private final String domain;
+ private final String ntHost;

public ProxyHttpClientConfigurer(String host, Integer port) {
- this(host, port, null, null, null);
+ this(host, port, null, null, null, null);
}

- public ProxyHttpClientConfigurer(String host, Integer port, String username, String password, String domain) {
+ public ProxyHttpClientConfigurer(String host, Integer port, String username, String password, String domain, String ntHost) {
this.host = host;
this.port = port;
this.username = username;
this.password = password;
this.domain = domain;
+ this.ntHost = ntHost;
}

public void configureHttpClient(HttpClient client) {
client.getHostConfiguration().setProxy(host, port);

if (username != null && password != null) {
- Credentials defaultcreds = new NTCredentials(username, password, null, domain);
+ Credentials defaultcreds;
+ if (domain != null) {
+ defaultcreds = new NTCredentials(username, password, ntHost, domain);
+ } else {
+ defaultcreds = new UsernamePasswordCredentials(username, password);
+ }
client.getState().setProxyCredentials(AuthScope.ANY, defaultcreds);
}
}