camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [2/2] camel git commit: CAMEL-9951: Update docs
Date Mon, 09 May 2016 11:42:37 GMT
CAMEL-9951: Update docs


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

Branch: refs/heads/master
Commit: cbc1718afc961e7dff46603c1379d23fd078a1fd
Parents: f89682b
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Mon May 9 13:40:02 2016 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Mon May 9 13:40:02 2016 +0200

----------------------------------------------------------------------
 components/camel-websocket/src/main/docs/websocket.adoc        | 6 ++++--
 .../apache/camel/component/websocket/WebsocketComponent.java   | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cbc1718a/components/camel-websocket/src/main/docs/websocket.adoc
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/docs/websocket.adoc b/components/camel-websocket/src/main/docs/websocket.adoc
index 1a59752..44c13cf 100644
--- a/components/camel-websocket/src/main/docs/websocket.adoc
+++ b/components/camel-websocket/src/main/docs/websocket.adoc
@@ -34,6 +34,7 @@ Websocket Options
 
 
 
+
 // component options: START
 The Jetty Websocket component supports 12 options which are listed below.
 
@@ -49,8 +50,8 @@ The Jetty Websocket component supports 12 options which are listed below.
 | sslPassword | String | The password when using SSL.
 | sslKeystore | String | The path to the keystore.
 | enableJmx | boolean | If this option is true Jetty JMX support will be enabled for this
endpoint. See Jetty JMX support for more details.
-| minThreads | Integer | To set a value for minimum number of threads in server thread pool.
MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9.
-| maxThreads | Integer | To set a value for maximum number of threads in server thread pool.
MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9.
+| minThreads | Integer | To set a value for minimum number of threads in server thread pool.
MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9. The default
values for minThreads is 1.
+| maxThreads | Integer | To set a value for maximum number of threads in server thread pool.
MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9. The default
values for maxThreads is 1 2 noCores.
 | threadPool | ThreadPool | To use a custom thread pool for the server. MaxThreads/minThreads
or threadPool fields are required due to switch to Jetty9.
 | sslContextParameters | SSLContextParameters | To configure security using SSLContextParameters
 | socketFactory | Map | To configure a map which contains custom WebSocketFactory for sub
protocols. The key in the map is the sub protocol. The default key is reserved for the default
implementation.
@@ -61,6 +62,7 @@ The Jetty Websocket component supports 12 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Jetty Websocket component supports 20 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/cbc1718a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index ca0d6f6..bdbc941 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -693,6 +693,7 @@ public class WebsocketComponent extends UriEndpointComponent {
 
     /**
      * To set a value for minimum number of threads in server thread pool. MaxThreads/minThreads
or threadPool fields are required due to switch to Jetty9.
+     * The default values for minThreads is 1.
      */
     public void setMinThreads(Integer minThreads) {
         this.minThreads = minThreads;
@@ -704,6 +705,7 @@ public class WebsocketComponent extends UriEndpointComponent {
 
     /**
      * To set a value for maximum number of threads in server thread pool. MaxThreads/minThreads
or threadPool fields are required due to switch to Jetty9.
+     * The default values for maxThreads is 1 + 2 * noCores.
      */
     public void setMaxThreads(Integer maxThreads) {
         this.maxThreads = maxThreads;


Mime
View raw message