camel git commit: CAMEL-10441 Updated the documentation of WorkerGroup option in camel-netty4

2016-11-03 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 8351873ee -> c5a8c6778


CAMEL-10441 Updated the documentation of WorkerGroup option in camel-netty4


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c5a8c677
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c5a8c677
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c5a8c677

Branch: refs/heads/camel-2.18.x
Commit: c5a8c6778a5ebb6fda957427160d57602c0bac3e
Parents: 8351873
Author: Willem Jiang 
Authored: Thu Nov 3 18:34:29 2016 +0800
Committer: Willem Jiang 
Committed: Thu Nov 3 19:09:59 2016 +0800

--
 .../netty4/springboot/NettyComponentConfiguration.java | 5 +++--
 .../camel-netty4-http/src/main/docs/netty4-http-component.adoc | 4 ++--
 components/camel-netty4/src/main/docs/netty4-component.adoc| 4 ++--
 .../component/netty4/NettyServerBootstrapConfiguration.java| 6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c5a8c677/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
--
diff --git 
a/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
 
b/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
index 2c6ffe0..fb5f59d 100644
--- 
a/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
+++ 
b/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
@@ -449,8 +449,9 @@ public class NettyComponentConfiguration {
 private EventLoopGroup bossGroup;
 /**
  * To use a explicit EventLoopGroup as the boss thread pool. For 
example
- * to share a thread pool with multiple consumers. By default each
- * consumer has their own boss pool with 1 core thread.
+ * to share a thread pool with multiple consumers or producers. By
+ * default each consumer or producer has their own worker pool with 2 x
+ * cpu count core threads.
  */
 private EventLoopGroup workerGroup;
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/c5a8c677/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
--
diff --git 
a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc 
b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
index 21d994a..b3265bc 100644
--- a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
+++ b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
@@ -148,8 +148,6 @@ The Netty4 HTTP component supports 82 endpoint options 
which are listed below:
 | traceEnabled | consumer (advanced) | false | boolean | Specifies whether to 
enable HTTP TRACE for this Netty HTTP consumer. By default TRACE is turned off.
 | urlDecodeHeaders | consumer (advanced) | false | boolean | If this option is 
enabled then during binding from Netty to Camel Message then the header values 
will be URL decoded (eg 20 will be a space character. Notice this option is 
used by the default org.apache.camel.component.netty.http.NettyHttpBinding and 
therefore if you implement a custom 
org.apache.camel.component.netty4.http.NettyHttpBinding then you would need to 
decode the headers accordingly to this option.
 | usingExecutorService | consumer (advanced) | true | boolean | Whether to use 
ordered thread pool to ensure events are processed orderly on the same channel.
-| workerCount | consumer (advanced) |  | int | When netty works on nio mode it 
uses default workerCount parameter from Netty which is cpu_core_threads2. User 
can use this operation to override the default workerCount from Netty
-| workerGroup | consumer (advanced) |  | EventLoopGroup | To use a explicit 
EventLoopGroup as the boss thread pool. For example to share a thread pool with 
multiple consumers. By default each consumer has their own boss pool with 1 
core thread.
 | connectTimeout | producer | 1 | int | Time to wait for a socket 
connection to be available. Value is in millis.
 | requestTimeout | producer |  | long | Allows to use a timeout for the Netty 
producer when calling a remote server. By default no timeout is in use. The 
value is in milli seconds so eg 3 is 30 seconds. The requestTimeout is 
using Netty's ReadTimeoutHandler to trigger the timeout.
 | reuseChannel |

camel git commit: CAMEL-10441 Updated the documentation of WorkerGroup option in camel-netty4

2016-11-03 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/master 9b0b25886 -> 200e097d9


CAMEL-10441 Updated the documentation of WorkerGroup option in camel-netty4


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/200e097d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/200e097d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/200e097d

Branch: refs/heads/master
Commit: 200e097d9df501724b4e7681768562daef3e4359
Parents: 9b0b258
Author: Willem Jiang 
Authored: Thu Nov 3 18:34:29 2016 +0800
Committer: Willem Jiang 
Committed: Thu Nov 3 18:34:29 2016 +0800

--
 .../netty4/springboot/NettyComponentConfiguration.java | 5 +++--
 .../camel-netty4-http/src/main/docs/netty4-http-component.adoc | 4 ++--
 components/camel-netty4/src/main/docs/netty4-component.adoc| 4 ++--
 .../component/netty4/NettyServerBootstrapConfiguration.java| 6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/200e097d/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
--
diff --git 
a/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
 
b/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
index 2c6ffe0..fb5f59d 100644
--- 
a/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
+++ 
b/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
@@ -449,8 +449,9 @@ public class NettyComponentConfiguration {
 private EventLoopGroup bossGroup;
 /**
  * To use a explicit EventLoopGroup as the boss thread pool. For 
example
- * to share a thread pool with multiple consumers. By default each
- * consumer has their own boss pool with 1 core thread.
+ * to share a thread pool with multiple consumers or producers. By
+ * default each consumer or producer has their own worker pool with 2 x
+ * cpu count core threads.
  */
 private EventLoopGroup workerGroup;
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/200e097d/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
--
diff --git 
a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc 
b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
index f122836..382e090 100644
--- a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
+++ b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
@@ -148,8 +148,6 @@ The Netty4 HTTP component supports 83 endpoint options 
which are listed below:
 | traceEnabled | consumer (advanced) | false | boolean | Specifies whether to 
enable HTTP TRACE for this Netty HTTP consumer. By default TRACE is turned off.
 | urlDecodeHeaders | consumer (advanced) | false | boolean | If this option is 
enabled then during binding from Netty to Camel Message then the header values 
will be URL decoded (eg 20 will be a space character. Notice this option is 
used by the default org.apache.camel.component.netty.http.NettyHttpBinding and 
therefore if you implement a custom 
org.apache.camel.component.netty4.http.NettyHttpBinding then you would need to 
decode the headers accordingly to this option.
 | usingExecutorService | consumer (advanced) | true | boolean | Whether to use 
ordered thread pool to ensure events are processed orderly on the same channel.
-| workerCount | consumer (advanced) |  | int | When netty works on nio mode it 
uses default workerCount parameter from Netty which is cpu_core_threads2. User 
can use this operation to override the default workerCount from Netty
-| workerGroup | consumer (advanced) |  | EventLoopGroup | To use a explicit 
EventLoopGroup as the boss thread pool. For example to share a thread pool with 
multiple consumers. By default each consumer has their own boss pool with 1 
core thread.
 | connectTimeout | producer | 1 | int | Time to wait for a socket 
connection to be available. Value is in millis.
 | cookieHandler | producer |  | CookieHandler | Configure a cookie handler to 
maintain a HTTP session
 | requestTimeout | producer |  | long | Allows to use a timeout for the Netty 
producer when calling a remote server. By default no timeout is in use. The 
value is in milli seconds so eg 3 is 30 seconds. The