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 2013/10/07 18:47:52 UTC
[1/6] git commit: CAMEL-6017: Allow to configure proxy host/port on
component level instead of having to do it on each endpoint.
Updated Branches:
refs/heads/camel-2.11.x 3334a78f6 -> 117257096
refs/heads/camel-2.12.x 63423cc93 -> f1f69f00c
refs/heads/master 5212f9abc -> d0d6560da
CAMEL-6017: Allow to configure proxy host/port on component level instead of having to do it on each endpoint.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3969f8af
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3969f8af
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3969f8af
Branch: refs/heads/master
Commit: 3969f8afe2c0f85148dcfaa63e2c87fe55c6cdf9
Parents: 5212f9a
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Oct 7 18:28:16 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Oct 7 18:28:16 2013 +0200
----------------------------------------------------------------------
.../component/jetty/JettyHttpComponent.java | 22 ++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3969f8af/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index c2b3108..333f5f9 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -104,6 +104,8 @@ public class JettyHttpComponent extends HttpComponent {
protected Integer requestHeaderSize;
protected Integer responseBufferSize;
protected Integer responseHeaderSize;
+ protected String proxyHost;
+ private Integer proxyPort;
class ConnectorRef {
Server server;
@@ -154,8 +156,8 @@ public class JettyHttpComponent extends HttpComponent {
UrlRewrite urlRewrite = resolveAndRemoveReferenceParameter(parameters, "urlRewrite", UrlRewrite.class);
SSLContextParameters sslContextParameters = resolveAndRemoveReferenceParameter(parameters, "sslContextParametersRef", SSLContextParameters.class);
SSLContextParameters ssl = sslContextParameters != null ? sslContextParameters : this.sslContextParameters;
- String proxyHost = getAndRemoveParameter(parameters, "proxyHost", String.class);
- Integer proxyPort = getAndRemoveParameter(parameters, "proxyPort", Integer.class);
+ String proxyHost = getAndRemoveParameter(parameters, "proxyHost", String.class, getProxyHost());
+ Integer proxyPort = getAndRemoveParameter(parameters, "proxyPort", Integer.class, getProxyPort());
Integer responseBufferSize = getAndRemoveParameter(parameters, "responseBufferSize", Integer.class, getResponseBufferSize());
// extract httpClient. parameters
@@ -891,6 +893,22 @@ public class JettyHttpComponent extends HttpComponent {
this.responseHeaderSize = responseHeaderSize;
}
+ public String getProxyHost() {
+ return proxyHost;
+ }
+
+ public void setProxyHost(String proxyHost) {
+ this.proxyHost = proxyHost;
+ }
+
+ public Integer getProxyPort() {
+ return proxyPort;
+ }
+
+ public void setProxyPort(Integer proxyPort) {
+ this.proxyPort = proxyPort;
+ }
+
// Implementation methods
// -------------------------------------------------------------------------
protected CamelServlet createServletForConnector(Server server, Connector connector,
[5/6] git commit: CAMEL-6017: Allow to configure proxy host/port on
component level instead of having to do it on each endpoint.
Posted by da...@apache.org.
CAMEL-6017: Allow to configure proxy host/port on component level instead of having to do it on each endpoint.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/01408224
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/01408224
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/01408224
Branch: refs/heads/camel-2.11.x
Commit: 014082245fbcdea49d4c2cad5debac0f1265d1d3
Parents: 3334a78
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Oct 7 18:28:16 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Oct 7 18:47:27 2013 +0200
----------------------------------------------------------------------
.../component/jetty/JettyHttpComponent.java | 22 ++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/01408224/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index a104197..7c6a9bb 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -104,6 +104,8 @@ public class JettyHttpComponent extends HttpComponent {
protected Integer requestHeaderSize;
protected Integer responseBufferSize;
protected Integer responseHeaderSize;
+ protected String proxyHost;
+ private Integer proxyPort;
class ConnectorRef {
Server server;
@@ -154,8 +156,8 @@ public class JettyHttpComponent extends HttpComponent {
UrlRewrite urlRewrite = resolveAndRemoveReferenceParameter(parameters, "urlRewrite", UrlRewrite.class);
SSLContextParameters sslContextParameters = resolveAndRemoveReferenceParameter(parameters, "sslContextParametersRef", SSLContextParameters.class);
SSLContextParameters ssl = sslContextParameters != null ? sslContextParameters : this.sslContextParameters;
- String proxyHost = getAndRemoveParameter(parameters, "proxyHost", String.class);
- Integer proxyPort = getAndRemoveParameter(parameters, "proxyPort", Integer.class);
+ String proxyHost = getAndRemoveParameter(parameters, "proxyHost", String.class, getProxyHost());
+ Integer proxyPort = getAndRemoveParameter(parameters, "proxyPort", Integer.class, getProxyPort());
Integer responseBufferSize = getAndRemoveParameter(parameters, "responseBufferSize", Integer.class, getResponseBufferSize());
// extract httpClient. parameters
@@ -891,6 +893,22 @@ public class JettyHttpComponent extends HttpComponent {
this.responseHeaderSize = responseHeaderSize;
}
+ public String getProxyHost() {
+ return proxyHost;
+ }
+
+ public void setProxyHost(String proxyHost) {
+ this.proxyHost = proxyHost;
+ }
+
+ public Integer getProxyPort() {
+ return proxyPort;
+ }
+
+ public void setProxyPort(Integer proxyPort) {
+ this.proxyPort = proxyPort;
+ }
+
// Implementation methods
// -------------------------------------------------------------------------
protected CamelServlet createServletForConnector(Server server, Connector connector,
[3/6] git commit: CAMEL-6017: Allow to configure proxy host/port on
component level instead of having to do it on each endpoint.
Posted by da...@apache.org.
CAMEL-6017: Allow to configure proxy host/port on component level instead of having to do it on each endpoint.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d02dbb3f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d02dbb3f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d02dbb3f
Branch: refs/heads/camel-2.12.x
Commit: d02dbb3f2cefadd48d01abdfcd0e14491d104694
Parents: 63423cc
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Oct 7 18:28:16 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Oct 7 18:47:09 2013 +0200
----------------------------------------------------------------------
.../component/jetty/JettyHttpComponent.java | 22 ++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d02dbb3f/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index c2b3108..333f5f9 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -104,6 +104,8 @@ public class JettyHttpComponent extends HttpComponent {
protected Integer requestHeaderSize;
protected Integer responseBufferSize;
protected Integer responseHeaderSize;
+ protected String proxyHost;
+ private Integer proxyPort;
class ConnectorRef {
Server server;
@@ -154,8 +156,8 @@ public class JettyHttpComponent extends HttpComponent {
UrlRewrite urlRewrite = resolveAndRemoveReferenceParameter(parameters, "urlRewrite", UrlRewrite.class);
SSLContextParameters sslContextParameters = resolveAndRemoveReferenceParameter(parameters, "sslContextParametersRef", SSLContextParameters.class);
SSLContextParameters ssl = sslContextParameters != null ? sslContextParameters : this.sslContextParameters;
- String proxyHost = getAndRemoveParameter(parameters, "proxyHost", String.class);
- Integer proxyPort = getAndRemoveParameter(parameters, "proxyPort", Integer.class);
+ String proxyHost = getAndRemoveParameter(parameters, "proxyHost", String.class, getProxyHost());
+ Integer proxyPort = getAndRemoveParameter(parameters, "proxyPort", Integer.class, getProxyPort());
Integer responseBufferSize = getAndRemoveParameter(parameters, "responseBufferSize", Integer.class, getResponseBufferSize());
// extract httpClient. parameters
@@ -891,6 +893,22 @@ public class JettyHttpComponent extends HttpComponent {
this.responseHeaderSize = responseHeaderSize;
}
+ public String getProxyHost() {
+ return proxyHost;
+ }
+
+ public void setProxyHost(String proxyHost) {
+ this.proxyHost = proxyHost;
+ }
+
+ public Integer getProxyPort() {
+ return proxyPort;
+ }
+
+ public void setProxyPort(Integer proxyPort) {
+ this.proxyPort = proxyPort;
+ }
+
// Implementation methods
// -------------------------------------------------------------------------
protected CamelServlet createServletForConnector(Server server, Connector connector,
[4/6] git commit: CAMEL-6825: client min/max threads uri options is
internal in camel-jetty.
Posted by da...@apache.org.
CAMEL-6825: client min/max threads uri options is internal in camel-jetty.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f1f69f00
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f1f69f00
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f1f69f00
Branch: refs/heads/camel-2.12.x
Commit: f1f69f00cd8a937bfd01cfd057a3e6c1138f6f97
Parents: d02dbb3
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Oct 7 18:46:50 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Oct 7 18:47:15 2013 +0200
----------------------------------------------------------------------
.../apache/camel/component/jetty/JettyHttpComponent.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f1f69f00/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 333f5f9..e22458c 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -159,7 +159,9 @@ public class JettyHttpComponent extends HttpComponent {
String proxyHost = getAndRemoveParameter(parameters, "proxyHost", String.class, getProxyHost());
Integer proxyPort = getAndRemoveParameter(parameters, "proxyPort", Integer.class, getProxyPort());
Integer responseBufferSize = getAndRemoveParameter(parameters, "responseBufferSize", Integer.class, getResponseBufferSize());
-
+ Integer httpClientMinThreads = getAndRemoveParameter(parameters, "httpClientMinThreads", Integer.class, this.httpClientMinThreads);
+ Integer httpClientMaxThreads = getAndRemoveParameter(parameters, "httpClientMaxThreads", Integer.class, this.httpClientMaxThreads);
+
// extract httpClient. parameters
Map<String, Object> httpClientParameters = IntrospectionSupport.extractProperties(parameters, "httpClient.");
@@ -255,6 +257,12 @@ public class JettyHttpComponent extends HttpComponent {
if (responseBufferSize != null) {
endpoint.setResponseBufferSize(responseBufferSize);
}
+ if (httpClientMinThreads != null) {
+ endpoint.setHttpClientMinThreads(httpClientMinThreads);
+ }
+ if (httpClientMaxThreads != null) {
+ endpoint.setHttpClientMaxThreads(httpClientMaxThreads);
+ }
setProperties(endpoint, parameters);
return endpoint;
[6/6] git commit: CAMEL-6825: client min/max threads uri options is
internal in camel-jetty.
Posted by da...@apache.org.
CAMEL-6825: client min/max threads uri options is internal in camel-jetty.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/11725709
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/11725709
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/11725709
Branch: refs/heads/camel-2.11.x
Commit: 117257096b67ac5a9b54015ae05316834ca9a22a
Parents: 0140822
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Oct 7 18:46:50 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Oct 7 18:47:36 2013 +0200
----------------------------------------------------------------------
.../apache/camel/component/jetty/JettyHttpComponent.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/11725709/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 7c6a9bb..33c21fd 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -159,7 +159,9 @@ public class JettyHttpComponent extends HttpComponent {
String proxyHost = getAndRemoveParameter(parameters, "proxyHost", String.class, getProxyHost());
Integer proxyPort = getAndRemoveParameter(parameters, "proxyPort", Integer.class, getProxyPort());
Integer responseBufferSize = getAndRemoveParameter(parameters, "responseBufferSize", Integer.class, getResponseBufferSize());
-
+ Integer httpClientMinThreads = getAndRemoveParameter(parameters, "httpClientMinThreads", Integer.class, this.httpClientMinThreads);
+ Integer httpClientMaxThreads = getAndRemoveParameter(parameters, "httpClientMaxThreads", Integer.class, this.httpClientMaxThreads);
+
// extract httpClient. parameters
Map<String, Object> httpClientParameters = IntrospectionSupport.extractProperties(parameters, "httpClient.");
@@ -255,6 +257,12 @@ public class JettyHttpComponent extends HttpComponent {
if (responseBufferSize != null) {
endpoint.setResponseBufferSize(responseBufferSize);
}
+ if (httpClientMinThreads != null) {
+ endpoint.setHttpClientMinThreads(httpClientMinThreads);
+ }
+ if (httpClientMaxThreads != null) {
+ endpoint.setHttpClientMaxThreads(httpClientMaxThreads);
+ }
setProperties(endpoint, parameters);
return endpoint;
[2/6] git commit: CAMEL-6825: client min/max threads uri options is
internal in camel-jetty.
Posted by da...@apache.org.
CAMEL-6825: client min/max threads uri options is internal in camel-jetty.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d0d6560d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d0d6560d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d0d6560d
Branch: refs/heads/master
Commit: d0d6560dab9a16b2a04c2977befabf08f124b1de
Parents: 3969f8a
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Oct 7 18:46:50 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Oct 7 18:46:50 2013 +0200
----------------------------------------------------------------------
.../apache/camel/component/jetty/JettyHttpComponent.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d0d6560d/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 333f5f9..e22458c 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -159,7 +159,9 @@ public class JettyHttpComponent extends HttpComponent {
String proxyHost = getAndRemoveParameter(parameters, "proxyHost", String.class, getProxyHost());
Integer proxyPort = getAndRemoveParameter(parameters, "proxyPort", Integer.class, getProxyPort());
Integer responseBufferSize = getAndRemoveParameter(parameters, "responseBufferSize", Integer.class, getResponseBufferSize());
-
+ Integer httpClientMinThreads = getAndRemoveParameter(parameters, "httpClientMinThreads", Integer.class, this.httpClientMinThreads);
+ Integer httpClientMaxThreads = getAndRemoveParameter(parameters, "httpClientMaxThreads", Integer.class, this.httpClientMaxThreads);
+
// extract httpClient. parameters
Map<String, Object> httpClientParameters = IntrospectionSupport.extractProperties(parameters, "httpClient.");
@@ -255,6 +257,12 @@ public class JettyHttpComponent extends HttpComponent {
if (responseBufferSize != null) {
endpoint.setResponseBufferSize(responseBufferSize);
}
+ if (httpClientMinThreads != null) {
+ endpoint.setHttpClientMinThreads(httpClientMinThreads);
+ }
+ if (httpClientMaxThreads != null) {
+ endpoint.setHttpClientMaxThreads(httpClientMaxThreads);
+ }
setProperties(endpoint, parameters);
return endpoint;