Repository: camel
Updated Branches:
  refs/heads/master 906a612d3 -> 870b756e2


http://git-wip-us.apache.org/repos/asf/camel/blob/870b756e/components/camel-undertow/src/main/docs/undertow-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-undertow/src/main/docs/undertow-component.adoc 
b/components/camel-undertow/src/main/docs/undertow-component.adoc
index 633dac8..2fed567 100644
--- a/components/camel-undertow/src/main/docs/undertow-component.adoc
+++ b/components/camel-undertow/src/main/docs/undertow-component.adoc
@@ -72,11 +72,11 @@ The Undertow component supports 18 endpoint options which 
are listed below:
 |=======================================================================
 | Name | Group | Default | Java Type | Description
 | httpURI | common |  | URI | *Required* The url of the HTTP endpoint to use.
-| 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.
+| 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 or ERROR level and ignored.
 | httpMethodRestrict | consumer |  | String | Used to only allow consuming if 
the HttpMethod matches such as GET/POST/PUT etc. Multiple methods can be 
specified separated by comma.
 | matchOnUriPrefix | consumer | true | Boolean | Whether or not the consumer 
should try to find a target consumer by matching the URI prefix if no exact 
match is found.
 | optionsEnabled | consumer | false | boolean | Specifies whether to enable 
HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.
-| 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.
+| 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 or ERROR level and ignored.
 | exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.
 | cookieHandler | producer |  | CookieHandler | Configure a cookie handler to 
maintain a HTTP session
 | keepAlive | producer | true | Boolean | Setting to ensure socket is not 
closed due to inactivity

http://git-wip-us.apache.org/repos/asf/camel/blob/870b756e/components/camel-vertx/src/main/docs/vertx-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-vertx/src/main/docs/vertx-component.adoc 
b/components/camel-vertx/src/main/docs/vertx-component.adoc
index 6deb4c0..b2e9ac7 100644
--- a/components/camel-vertx/src/main/docs/vertx-component.adoc
+++ b/components/camel-vertx/src/main/docs/vertx-component.adoc
@@ -72,8 +72,8 @@ The Vert.x component supports 6 endpoint options which are 
listed below:
 | Name | Group | Default | Java Type | Description
 | address | common |  | String | *Required* Sets the event bus address used to 
communicate
 | pubSub | common |  | Boolean | Whether to use publish/subscribe instead of 
point to point when sending to a vertx endpoint.
-| 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.
-| 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.
+| 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 or ERROR level and ignored.
+| 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 or ERROR level and ignored.
 | exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.
 | synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
 |=======================================================================

http://git-wip-us.apache.org/repos/asf/camel/blob/870b756e/components/camel-weather/src/main/docs/weather-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/main/docs/weather-component.adoc 
b/components/camel-weather/src/main/docs/weather-component.adoc
index d66100c..cfaf887 100644
--- a/components/camel-weather/src/main/docs/weather-component.adoc
+++ b/components/camel-weather/src/main/docs/weather-component.adoc
@@ -69,9 +69,9 @@ The Weather component supports 44 endpoint options which are 
listed below:
 | period | common |  | String | If null the current weather will be returned 
else use values of 5 7 14 days. Only the numeric value for the forecast period 
is actually parsed so spelling capitalisation of the time period is up to you 
(its ignored)
 | units | common |  | WeatherUnits | The units for temperature measurement.
 | weatherApi | common |  | WeatherApi | The API to be use (current forecast/3 
hour forecast daily station)
-| 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.
+| 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 or ERROR level and ignored.
 | sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling 
consumer did not poll any files you can enable this option to send an empty 
message (no body) instead.
-| 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.
+| 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 or ERROR level and ignored.
 | exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.
 | pollStrategy | consumer (advanced) |  | PollingConsumerPollStrategy | A 
pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to 
provide your custom implementation to control error handling usually occurred 
during the poll operation before an Exchange have been created and being routed 
in Camel.
 | httpConnectionManager | advanced |  | HttpConnectionManager | To use a 
custom HttpConnectionManager to manage connections

http://git-wip-us.apache.org/repos/asf/camel/blob/870b756e/components/camel-websocket/src/main/docs/websocket-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/docs/websocket-component.adoc 
b/components/camel-websocket/src/main/docs/websocket-component.adoc
index efe199f..66e0123 100644
--- a/components/camel-websocket/src/main/docs/websocket-component.adoc
+++ b/components/camel-websocket/src/main/docs/websocket-component.adoc
@@ -82,10 +82,10 @@ The Jetty Websocket component supports 21 endpoint options 
which are listed belo
 | port | common | 9292 | Integer | The port number. The default value is 9292. 
Setting this option on the component will use the component configured value as 
default.
 | resourceUri | common |  | String | *Required* Name of the websocket channel 
to use
 | maxBinaryMessageSize | common | -1 | Integer | Can be used to set the size 
in bytes that the websocket created by the websocketServlet may be accept 
before closing. (Default is -1 - or unlimited)
-| 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.
+| 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 or ERROR level and ignored.
 | sessionSupport | consumer | false | boolean | Whether to enable session 
support which enables HttpSession for each http request.
 | staticResources | consumer |  | String | Set a resource path for static 
resources (such as .html files etc). The resources can be loaded from classpath 
if you prefix with classpath: otherwise the resources is loaded from file 
system or from JAR files. For example to load from root classpath use 
classpath:. or classpath:WEB-INF/static If not configured (eg null) then no 
static resource is in use.
-| 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.
+| 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 or ERROR level and ignored.
 | exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.
 | sendTimeout | producer | 30000 | Integer | Timeout in millis when sending to 
a websocket channel. The default timeout is 30000 (30 seconds).
 | sendToAll | producer |  | Boolean | To send to all websocket subscribers. 
Can be used to configure on endpoint level instead of having to use the 
WebsocketConstants.SEND_TO_ALL header on the message.

http://git-wip-us.apache.org/repos/asf/camel/blob/870b756e/components/camel-xmpp/src/main/docs/xmpp-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-xmpp/src/main/docs/xmpp-component.adoc 
b/components/camel-xmpp/src/main/docs/xmpp-component.adoc
index b9988f6..2c35c9f 100644
--- a/components/camel-xmpp/src/main/docs/xmpp-component.adoc
+++ b/components/camel-xmpp/src/main/docs/xmpp-component.adoc
@@ -64,10 +64,10 @@ The XMPP component supports 21 endpoint options which are 
listed below:
 | testConnectionOnStartup | common | true | boolean | Specifies whether to 
test the connection on startup. This is used to ensure that the XMPP client has 
a valid connection to the XMPP server when the route starts. Camel throws an 
exception on startup if a connection cannot be established. When this option is 
set to false Camel will attempt to establish a lazy connection when needed by a 
producer and will poll for a consumer connection until the connection is 
established. Default is true.
 | createAccount | common (advanced) | false | boolean | If true an attempt to 
create an account will be made. Default is false.
 | resource | common (advanced) | Camel | String | XMPP resource. The default 
is Camel.
-| 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.
+| 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 or ERROR level and ignored.
 | connectionPollDelay | consumer | 10 | int | The amount of time in seconds 
between polls (in seconds) to verify the health of the XMPP connection or 
between attempts to establish an initial consumer connection. Camel will try to 
re-establish a connection if it has become inactive. Default is 10 seconds.
 | doc | consumer | false | boolean | Set a doc header on the IN message 
containing a Document form of the incoming packet; default is true if presence 
or pubsub are true otherwise false
-| 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.
+| 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 or ERROR level and ignored.
 | exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.
 | connectionConfig | advanced |  | ConnectionConfiguration | To use an 
existing connection configuration
 | synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).

http://git-wip-us.apache.org/repos/asf/camel/blob/870b756e/components/camel-yammer/src/main/docs/yammer-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/main/docs/yammer-component.adoc 
b/components/camel-yammer/src/main/docs/yammer-component.adoc
index c5e65d4..efa0392 100644
--- a/components/camel-yammer/src/main/docs/yammer-component.adoc
+++ b/components/camel-yammer/src/main/docs/yammer-component.adoc
@@ -83,7 +83,7 @@ The Yammer component supports 29 endpoint options which are 
listed below:
 | Name | Group | Default | Java Type | Description
 | function | common |  | YammerFunctionType | *Required* The function to use
 | useJson | common | false | boolean | Set to true if you want to use raw JSON 
rather than converting to POJOs.
-| 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.
+| 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 or ERROR level and ignored.
 | delay | consumer | 5000 | long | Delay between polling in millis
 | limit | consumer | -1 | int | Return only the specified number of messages. 
Works for threaded=true and threaded=extended.
 | newerThan | consumer | -1 | int | Returns messages newer than the message ID 
specified as a numeric string. This should be used when polling for new 
messages. If you're looking at messages and the most recent message returned is 
3516 you can make a request with the parameter newerThan=3516 to ensure that 
you do not get duplicate copies of messages already on your page.
@@ -91,7 +91,7 @@ The Yammer component supports 29 endpoint options which are 
listed below:
 | sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling 
consumer did not poll any files you can enable this option to send an empty 
message (no body) instead.
 | threaded | consumer |  | String | threaded=true will only return the first 
message in each thread. This parameter is intended for apps which display 
message threads collapsed. threaded=extended will return the thread starter 
messages in order of most recently active as well as the two most recent 
messages as they are viewed in the default view on the Yammer web interface.
 | userId | consumer |  | String | The user id
-| 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.
+| 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 or ERROR level and ignored.
 | exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.
 | pollStrategy | consumer (advanced) |  | PollingConsumerPollStrategy | A 
pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to 
provide your custom implementation to control error handling usually occurred 
during the poll operation before an Exchange have been created and being routed 
in Camel.
 | synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).

http://git-wip-us.apache.org/repos/asf/camel/blob/870b756e/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc 
b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
index d6de98b..25f74e1 100644
--- a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
+++ b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
@@ -81,10 +81,10 @@ The ZooKeeper component supports 14 endpoint options which 
are listed below:
 | listChildren | common | false | boolean | Whether the children of the node 
should be listed
 | timeout | common | 5000 | int | The time interval to wait on connection 
before timing out.
 | backoff | consumer | 5000 | long | The time interval to backoff for after an 
error before retrying.
-| 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.
+| 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 or ERROR level and ignored.
 | repeat | consumer | false | boolean | Should changes to the znode be 
'watched' and repeatedly processed.
 | sendEmptyMessageOnDelete | consumer | true | boolean | Upon the delete of a 
znode should an empty message be send to the consumer
-| 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.
+| 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 or ERROR level and ignored.
 | exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.
 | create | producer | false | boolean | Should the endpoint create the node if 
it does not currently exist.
 | createMode | producer | EPHEMERAL | String | The create mode that should be 
used for the newly created node

Reply via email to