Repository: camel Updated Branches: refs/heads/master fc46d5be1 -> 2ad2672f6
Component docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ad2672f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ad2672f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ad2672f Branch: refs/heads/master Commit: 2ad2672f6ee70743ef270c18c66965a202d42eee Parents: fc46d5b Author: Claus Ibsen <davscl...@apache.org> Authored: Sun May 15 11:06:24 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun May 15 11:08:22 2016 +0200 ---------------------------------------------------------------------- components/camel-etcd/src/main/docs/etcd.adoc | 4 +++- .../java/org/apache/camel/component/etcd/EtcdConfiguration.java | 2 +- .../java/org/apache/camel/component/jetty/JettyHttpEndpoint.java | 2 +- components/camel-jetty9/src/main/docs/jetty.adoc | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2ad2672f/components/camel-etcd/src/main/docs/etcd.adoc ---------------------------------------------------------------------- diff --git a/components/camel-etcd/src/main/docs/etcd.adoc b/components/camel-etcd/src/main/docs/etcd.adoc index f59f58d..e7e28b2 100644 --- a/components/camel-etcd/src/main/docs/etcd.adoc +++ b/components/camel-etcd/src/main/docs/etcd.adoc @@ -10,6 +10,7 @@ + // endpoint options: START The etcd component supports 15 endpoint options which are listed below: @@ -25,10 +26,10 @@ The etcd component supports 15 endpoint options which are listed below: | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN/ERROR level and ignored. | sendEmptyExchangeOnTimeout | consumer | false | boolean | To send an empty message in case of timeout watching for a key. | exceptionHandler | consumer (advanced) | | ExceptionHandler | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN/ERROR level and ignored. +| fromIndex | consumer (advanced) | 0 | Long | The index to watch from | timeToLive | producer | | Integer | To set the lifespan of a key in milliseconds. | exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange | synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). -| fromIndex | advance | 0 | Long | The index to watch from | password | security | | String | The password to use for basic authentication. | sslContextParameters | security | | SSLContextParameters | To configure security using SSLContextParameters. | userName | security | | String | The user name to use for basic authentication. @@ -47,6 +48,7 @@ The etcd component supports 15 endpoint options which are listed below: + // component options: START The etcd component has no options. // component options: END http://git-wip-us.apache.org/repos/asf/camel/blob/2ad2672f/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdConfiguration.java b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdConfiguration.java index 45d50f7..5edad92 100644 --- a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdConfiguration.java +++ b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdConfiguration.java @@ -39,7 +39,7 @@ public class EtcdConfiguration { private Integer timeToLive; @UriParam private Long timeout; - @UriParam(label = "consumer,advance", defaultValue = "0") + @UriParam(label = "consumer,advanced", defaultValue = "0") private Long fromIndex = 0L; public String getUris() { http://git-wip-us.apache.org/repos/asf/camel/blob/2ad2672f/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java index f21d8c4..8cfc32a 100644 --- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java +++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java @@ -99,7 +99,7 @@ public abstract class JettyHttpEndpoint extends HttpCommonEndpoint { description = "Allows using a custom filters which is putted into a list and can be find in the Registry." + " Multiple values can be separated by comma.") private List<Filter> filters; - @UriParam(label = "consumer, advanced", prefix = "filter.", multiValue = true, + @UriParam(label = "consumer,advanced", prefix = "filter.", multiValue = true, description = "Configuration of the filter init parameters. These parameters will be applied to the filter list before starting the jetty server.") private Map<String, String> filterInitParameters; http://git-wip-us.apache.org/repos/asf/camel/blob/2ad2672f/components/camel-jetty9/src/main/docs/jetty.adoc ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/main/docs/jetty.adoc b/components/camel-jetty9/src/main/docs/jetty.adoc index 43b09c7..e8abfef 100644 --- a/components/camel-jetty9/src/main/docs/jetty.adoc +++ b/components/camel-jetty9/src/main/docs/jetty.adoc @@ -100,6 +100,7 @@ The Jetty 9 component supports 30 options which are listed below. + // endpoint options: START The Jetty 9 component supports 52 endpoint options which are listed below: @@ -130,6 +131,7 @@ The Jetty 9 component supports 52 endpoint options which are listed below: | traceEnabled | consumer | false | boolean | Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off. | useContinuation | consumer | | Boolean | Whether or not to use Jetty continuations for the Jetty Server. | exceptionHandler | consumer (advanced) | | ExceptionHandler | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN/ERROR level and ignored. +| filterInitParameters | consumer (advanced) | | Map | Configuration of the filter init parameters. These parameters will be applied to the filter list before starting the jetty server. | filtersRef | consumer (advanced) | | String | Allows using a custom filters which is putted into a list and can be find in the Registry. Multiple values can be separated by comma. | handlers | consumer (advanced) | | String | Specifies a comma-delimited set of Handler instances to lookup in your Registry. These handlers are added to the Jetty servlet context (for example to add security). Important: You can not use different handlers with different Jetty endpoints using the same port number. The handlers is associated to the port number. If you need different handlers then use different port numbers. | httpBindingRef | consumer (advanced) | | String | Option to disable throwing the HttpOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code. @@ -156,7 +158,6 @@ The Jetty 9 component supports 52 endpoint options which are listed below: | mapHttpMessageFormUrlEncodedBody | advanced | true | boolean | If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping. | mapHttpMessageHeaders | advanced | true | boolean | If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping. | synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). -| filterInitParameters | advanced | | Map | Configuration of the filter init parameters. These parameters will be applied to the filter list before starting the jetty server. | sslContextParameters | security | | SSLContextParameters | To configure security using SSLContextParameters | sslContextParametersRef | security | | String | To configure security using SSLContextParameters |======================================================================= @@ -165,6 +166,7 @@ The Jetty 9 component supports 52 endpoint options which are listed below: + [[Jetty-MessageHeaders]] Message Headers ^^^^^^^^^^^^^^^
