You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/06/09 11:14:21 UTC
svn commit: r782926 - in /camel/branches/camel-1.x: ./
components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyTest.java
Author: davsclaus
Date: Tue Jun 9 09:14:19 2009
New Revision: 782926
URL: http://svn.apache.org/viewvc?rev=782926&view=rev
Log:
Merged revisions 782918,782923 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r782918 | davsclaus | 2009-06-09 10:55:02 +0200 (Tue, 09 Jun 2009) | 1 line
CAMEL-1687: camel-http now uses http proxy settings from java system properties. Thanks to Savas for patch.
........
r782923 | davsclaus | 2009-06-09 11:06:38 +0200 (Tue, 09 Jun 2009) | 1 line
CAMEL-1687: camel-http now uses http proxy settings from java system properties. Thanks to Savas for patch.
........
Added:
camel/branches/camel-1.x/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyTest.java
- copied unchanged from r782923, camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyTest.java
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 9 09:14:19 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
+/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
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/HttpEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java?rev=782926&r1=782925&r2=782926&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java (original)
+++ camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java Tue Jun 9 09:14:19 2009
@@ -30,6 +30,8 @@
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpConnectionManager;
import org.apache.commons.httpclient.params.HttpClientParams;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Represents a <a href="http://activemq.apache.org/camel/http.html">HTTP
@@ -39,6 +41,7 @@
*/
public class HttpEndpoint extends DefaultPollingEndpoint<HttpExchange> {
+ private static final transient Log LOG = LogFactory.getLog(HttpEndpoint.class);
private HttpBinding binding;
private HttpComponent component;
private URI httpUri;
@@ -82,6 +85,19 @@
*/
public HttpClient createHttpClient() {
HttpClient answer = new HttpClient(getClientParams());
+
+ // configure http proxy if defined as system property
+ // http://java.sun.com/javase/6/docs/technotes/guides/net/proxies.html
+ if (System.getProperty("http.proxyHost") != null && System.getProperty("http.proxyPort") != null) {
+ String host = System.getProperty("http.proxyHost");
+ int port = Integer.parseInt(System.getProperty("http.proxyPort"));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Java System Property http.proxyHost and http.proxyPort detected. Using http proxy host: "
+ + host + " port: " + port);
+ }
+ answer.getHostConfiguration().setProxy(host, port);
+ }
+
answer.setHttpConnectionManager(httpConnectionManager);
HttpClientConfigurer configurer = getHttpClientConfigurer();
if (configurer != null) {