http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-sjms/src/main/docs/sjms-batch-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/docs/sjms-batch-component.adoc 
b/components/camel-sjms/src/main/docs/sjms-batch-component.adoc
index 2a2cf47..cf8f2b2 100644
--- a/components/camel-sjms/src/main/docs/sjms-batch-component.adoc
+++ b/components/camel-sjms/src/main/docs/sjms-batch-component.adoc
@@ -114,19 +114,14 @@ The Simple JMS Batch component supports 5 options which 
are listed below.
 
 
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| advanced
-| connectionFactory |  | ConnectionFactory | A ConnectionFactory is required 
to enable the SjmsBatchComponent.
-
-| asyncStartListener | false | boolean | Whether to startup the consumer 
message listener asynchronously when starting a route. For example if a 
JmsConsumer cannot get a connection to a remote JMS broker then it may block 
while retrying and/or failover. This will cause Camel to block while starting 
routes. By setting this option to true you will let routes startup while the 
JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous 
mode. If this option is used then beware that if the connection could not be 
established then an exception is logged at WARN level and the consumer will not 
be able to receive messages; You can then restart the route to retry.
-
-| recoveryInterval | 5000 | int | Specifies the interval between recovery 
attempts i.e. when a connection is being refreshed in milliseconds. The default 
is 5000 ms that is 5 seconds.
- 4+^s| filter
-| headerFilterStrategy |  | HeaderFilterStrategy | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message.
- 4+^s| advanced
-| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
+| Name | Description | Default | Type
+| **connectionFactory** (advanced) | A ConnectionFactory is required to enable 
the SjmsBatchComponent. |  | ConnectionFactory
+| **asyncStartListener** (advanced) | Whether to startup the consumer message 
listener asynchronously when starting a route. For example if a JmsConsumer 
cannot get a connection to a remote JMS broker then it may block while retrying 
and/or failover. This will cause Camel to block while starting routes. By 
setting this option to true you will let routes startup while the JmsConsumer 
connects to the JMS broker using a dedicated thread in asynchronous mode. If 
this option is used then beware that if the connection could not be established 
then an exception is logged at WARN level and the consumer will not be able to 
receive messages; You can then restart the route to retry. | false | boolean
+| **recoveryInterval** (advanced) | Specifies the interval between recovery 
attempts i.e. when a connection is being refreshed in milliseconds. The default 
is 5000 ms that is 5 seconds. | 5000 | int
+| **headerFilterStrategy** (filter) | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message. |  | HeaderFilterStrategy
+| **resolveProperty Placeholders** (advanced) | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders. | true | boolean
 |=======================================================================
 // component options: END
 
@@ -147,61 +142,39 @@ with the following path and query parameters:
 
 #### Path Parameters (1 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| destinationName |  | String | *Required* The destination name. Only queues 
are supported names may be prefixed by 'queue:'.
+| Name | Description | Default | Type
+| **destinationName** | *Required* The destination name. Only queues are 
supported names may be prefixed by 'queue:'. |  | String
 |=======================================================================
 
 #### Query Parameters (22 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| aggregationStrategy |  | AggregationStrategy | *Required* The aggregation 
strategy to use which merges all the batched messages into a single message
-
-| allowNullBody | true | boolean | Whether to allow sending messages with no 
body. If this option is false and the message body is null then an JMSException 
is thrown.
-
-| bridgeErrorHandler | 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.
-
-| completionInterval | 1000 | int | The completion interval in millis which 
causes batches to be completed in a scheduled fixed rate every interval. The 
batch may be empty if the timeout triggered and there was no messages in the 
batch. Notice you cannot use both completion timeout and completion interval at 
the same time only one can be configured.
-
-| completionPredicate |  | String | The completion predicate which causes 
batches to be completed when the predicate evaluates as true. The predicate can 
also be configured using the simple language using the string syntax. You may 
want to set the option eagerCheckCompletion to true to let the predicate match 
the incoming message as otherwise it matches the aggregated message.
-
-| completionSize | 200 | int | The number of messages consumed at which the 
batch will be completed
-
-| completionTimeout | 500 | int | The timeout in millis from receipt of the 
first first message when the batch will be completed. The batch may be empty if 
the timeout triggered and there was no messages in the batch. Notice you cannot 
use both completion timeout and completion interval at the same time only one 
can be configured.
-
-| consumerCount | 1 | int | The number of JMS sessions to consume from
-
-| eagerCheckCompletion | false | boolean | Use eager completion checking which 
means that the completionPredicate will use the incoming Exchange. As opposed 
to without eager completion checking the completionPredicate will use the 
aggregated Exchange.
-
-| includeAllJMSXProperties | false | boolean | Whether to include all JMSXxxx 
properties when mapping from JMS to Camel Message. Setting this to true will 
include properties such as JMSXAppID and JMSXUserID etc. Note: If you are using 
a custom headerFilterStrategy then this option does not apply.
-
-| mapJmsMessage | true | boolean | Specifies whether Camel should auto map the 
received JMS message to a suited payload type such as javax.jms.TextMessage to 
a String etc. See section about how mapping works below for more details.
-
-| pollDuration | 1000 | int | The duration in milliseconds of each poll for 
messages. completionTimeOut will be used if it is shorter and a batch has 
started.
-
-| sendEmptyMessageWhenIdle | false | boolean | If using completion timeout or 
interval then the batch may be empty if the timeout triggered and there was no 
messages in the batch. If this option is true and the batch is empty then an 
empty message is added to the batch so an empty message is routed.
- 4+^s| consumer (advanced)
-| exceptionHandler |  | 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 |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
- 4+^s| advanced
-| asyncStartListener | false | boolean | Whether to startup the consumer 
message listener asynchronously when starting a route. For example if a 
JmsConsumer cannot get a connection to a remote JMS broker then it may block 
while retrying and/or failover. This will cause Camel to block while starting 
routes. By setting this option to true you will let routes startup while the 
JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous 
mode. If this option is used then beware that if the connection could not be 
established then an exception is logged at WARN level and the consumer will not 
be able to receive messages; You can then restart the route to retry.
-
-| headerFilterStrategy |  | HeaderFilterStrategy | To use a custom 
HeaderFilterStrategy to filter header to and from Camel message.
-
-| jmsKeyFormatStrategy |  | JmsKeyFormatStrategy | Pluggable strategy for 
encoding and decoding JMS keys so they can be compliant with the JMS 
specification. Camel provides two implementations out of the box: default and 
passthrough. The default strategy will safely marshal dots and hyphens (. and 
-). The passthrough strategy leaves the key as is. Can be used for JMS brokers 
which do not care whether JMS header keys contain illegal characters. You can 
provide your own implementation of the 
org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the 
notation.
-
-| messageCreatedStrategy |  | MessageCreatedStrategy | To use the given 
MessageCreatedStrategy which are invoked when Camel creates new instances of 
javax.jms.Message objects when Camel is sending a JMS message.
-
-| recoveryInterval | 5000 | int | Specifies the interval between recovery 
attempts i.e. when a connection is being refreshed in milliseconds. The default 
is 5000 ms that is 5 seconds.
-
-| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
-
-| timeoutCheckerExecutorService |  | ScheduledExecutorService | If using the 
completionInterval option a background thread is created to trigger the 
completion interval. Set this option to provide a custom thread pool to be used 
rather than creating a new thread for every consumer.
+| Name | Description | Default | Type
+| **aggregationStrategy** (consumer) | *Required* The aggregation strategy to 
use which merges all the batched messages into a single message |  | 
AggregationStrategy
+| **allowNullBody** (consumer) | Whether to allow sending messages with no 
body. If this option is false and the message body is null then an JMSException 
is thrown. | true | boolean
+| **bridgeErrorHandler** (consumer) | 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. | false | 
boolean
+| **completionInterval** (consumer) | The completion interval in millis which 
causes batches to be completed in a scheduled fixed rate every interval. The 
batch may be empty if the timeout triggered and there was no messages in the 
batch. Notice you cannot use both completion timeout and completion interval at 
the same time only one can be configured. | 1000 | int
+| **completionPredicate** (consumer) | The completion predicate which causes 
batches to be completed when the predicate evaluates as true. The predicate can 
also be configured using the simple language using the string syntax. You may 
want to set the option eagerCheckCompletion to true to let the predicate match 
the incoming message as otherwise it matches the aggregated message. |  | String
+| **completionSize** (consumer) | The number of messages consumed at which the 
batch will be completed | 200 | int
+| **completionTimeout** (consumer) | The timeout in millis from receipt of the 
first first message when the batch will be completed. The batch may be empty if 
the timeout triggered and there was no messages in the batch. Notice you cannot 
use both completion timeout and completion interval at the same time only one 
can be configured. | 500 | int
+| **consumerCount** (consumer) | The number of JMS sessions to consume from | 
1 | int
+| **eagerCheckCompletion** (consumer) | Use eager completion checking which 
means that the completionPredicate will use the incoming Exchange. As opposed 
to without eager completion checking the completionPredicate will use the 
aggregated Exchange. | false | boolean
+| **includeAllJMSXProperties** (consumer) | Whether to include all JMSXxxx 
properties when mapping from JMS to Camel Message. Setting this to true will 
include properties such as JMSXAppID and JMSXUserID etc. Note: If you are using 
a custom headerFilterStrategy then this option does not apply. | false | boolean
+| **mapJmsMessage** (consumer) | Specifies whether Camel should auto map the 
received JMS message to a suited payload type such as javax.jms.TextMessage to 
a String etc. See section about how mapping works below for more details. | 
true | boolean
+| **pollDuration** (consumer) | The duration in milliseconds of each poll for 
messages. completionTimeOut will be used if it is shorter and a batch has 
started. | 1000 | int
+| **sendEmptyMessageWhenIdle** (consumer) | If using completion timeout or 
interval then the batch may be empty if the timeout triggered and there was no 
messages in the batch. If this option is true and the batch is empty then an 
empty message is added to the batch so an empty message is routed. | false | 
boolean
+| **exceptionHandler** (consumer) | 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. |  | ExceptionHandler
+| **exchangePattern** (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
+| **asyncStartListener** (advanced) | Whether to startup the consumer message 
listener asynchronously when starting a route. For example if a JmsConsumer 
cannot get a connection to a remote JMS broker then it may block while retrying 
and/or failover. This will cause Camel to block while starting routes. By 
setting this option to true you will let routes startup while the JmsConsumer 
connects to the JMS broker using a dedicated thread in asynchronous mode. If 
this option is used then beware that if the connection could not be established 
then an exception is logged at WARN level and the consumer will not be able to 
receive messages; You can then restart the route to retry. | false | boolean
+| **headerFilterStrategy** (advanced) | To use a custom HeaderFilterStrategy 
to filter header to and from Camel message. |  | HeaderFilterStrategy
+| **jmsKeyFormatStrategy** (advanced) | Pluggable strategy for encoding and 
decoding JMS keys so they can be compliant with the JMS specification. Camel 
provides two implementations out of the box: default and passthrough. The 
default strategy will safely marshal dots and hyphens (. and -). The 
passthrough strategy leaves the key as is. Can be used for JMS brokers which do 
not care whether JMS header keys contain illegal characters. You can provide 
your own implementation of the 
org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the 
notation. |  | JmsKeyFormatStrategy
+| **messageCreatedStrategy** (advanced) | To use the given 
MessageCreatedStrategy which are invoked when Camel creates new instances of 
javax.jms.Message objects when Camel is sending a JMS message. |  | 
MessageCreatedStrategy
+| **recoveryInterval** (advanced) | Specifies the interval between recovery 
attempts i.e. when a connection is being refreshed in milliseconds. The default 
is 5000 ms that is 5 seconds. | 5000 | int
+| **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
+| **timeoutCheckerExecutor Service** (advanced) | If using the 
completionInterval option a background thread is created to trigger the 
completion interval. Set this option to provide a custom thread pool to be used 
rather than creating a new thread for every consumer. |  | ScheduledExecutor 
Service
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-sjms/src/main/docs/sjms-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/docs/sjms-component.adoc 
b/components/camel-sjms/src/main/docs/sjms-component.adoc
index 71f7a62..2c5ad51 100644
--- a/components/camel-sjms/src/main/docs/sjms-component.adoc
+++ b/components/camel-sjms/src/main/docs/sjms-component.adoc
@@ -87,39 +87,24 @@ The Simple JMS component supports 15 options which are 
listed below.
 
 
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| advanced
-| connectionFactory |  | ConnectionFactory | A ConnectionFactory is required 
to enable the SjmsComponent. It can be set directly or set set as part of a 
ConnectionResource.
-
-| connectionResource |  | ConnectionResource | A ConnectionResource is an 
interface that allows for customization and container control of the 
ConnectionFactory. See Plugable Connection Resource Management for further 
details.
- 4+^s| common
-| connectionCount | 1 | Integer | The maximum number of connections available 
to endpoints started under this component
- 4+^s| advanced
-| jmsKeyFormatStrategy |  | JmsKeyFormatStrategy | Pluggable strategy for 
encoding and decoding JMS keys so they can be compliant with the JMS 
specification. Camel provides one implementation out of the box: default. The 
default strategy will safely marshal dots and hyphens (. and -). Can be used 
for JMS brokers which do not care whether JMS header keys contain illegal 
characters. You can provide your own implementation of the 
org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the 
notation.
- 4+^s| transaction
-| transactionCommitStrategy |  | TransactionCommitStrategy | To configure 
which kind of commit strategy to use. Camel provides two implementations out of 
the box default and batch.
- 4+^s| advanced
-| destinationCreationStrategy |  | DestinationCreationStrategy | To use a 
custom DestinationCreationStrategy.
-
-| timedTaskManager |  | TimedTaskManager | To use a custom TimedTaskManager
-
-| messageCreatedStrategy |  | MessageCreatedStrategy | To use the given 
MessageCreatedStrategy which are invoked when Camel creates new instances of 
javax.jms.Message objects when Camel is sending a JMS message.
-
-| connectionTestOnBorrow | true | boolean | When using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource then should each 
javax.jms.Connection be tested (calling start) before returned from the pool.
- 4+^s| security
-| connectionUsername |  | String | The username to use when creating 
javax.jms.Connection when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
-
-| connectionPassword |  | String | The password to use when creating 
javax.jms.Connection when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
- 4+^s| advanced
-| connectionClientId |  | String | The client ID to use when creating 
javax.jms.Connection when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
-
-| connectionMaxWait | 5000 | long | The max wait time in millis to block and 
wait on free connection when the pool is exhausted when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
- 4+^s| filter
-| headerFilterStrategy |  | HeaderFilterStrategy | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message.
- 4+^s| advanced
-| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
+| Name | Description | Default | Type
+| **connectionFactory** (advanced) | A ConnectionFactory is required to enable 
the SjmsComponent. It can be set directly or set set as part of a 
ConnectionResource. |  | ConnectionFactory
+| **connectionResource** (advanced) | A ConnectionResource is an interface 
that allows for customization and container control of the ConnectionFactory. 
See Plugable Connection Resource Management for further details. |  | 
ConnectionResource
+| **connectionCount** (common) | The maximum number of connections available 
to endpoints started under this component | 1 | Integer
+| **jmsKeyFormatStrategy** (advanced) | Pluggable strategy for encoding and 
decoding JMS keys so they can be compliant with the JMS specification. Camel 
provides one implementation out of the box: default. The default strategy will 
safely marshal dots and hyphens (. and -). Can be used for JMS brokers which do 
not care whether JMS header keys contain illegal characters. You can provide 
your own implementation of the 
org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the 
notation. |  | JmsKeyFormatStrategy
+| **transactionCommit Strategy** (transaction) | To configure which kind of 
commit strategy to use. Camel provides two implementations out of the box 
default and batch. |  | TransactionCommit Strategy
+| **destinationCreation Strategy** (advanced) | To use a custom 
DestinationCreationStrategy. |  | DestinationCreation Strategy
+| **timedTaskManager** (advanced) | To use a custom TimedTaskManager |  | 
TimedTaskManager
+| **messageCreatedStrategy** (advanced) | To use the given 
MessageCreatedStrategy which are invoked when Camel creates new instances of 
javax.jms.Message objects when Camel is sending a JMS message. |  | 
MessageCreatedStrategy
+| **connectionTestOnBorrow** (advanced) | When using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource then should each 
javax.jms.Connection be tested (calling start) before returned from the pool. | 
true | boolean
+| **connectionUsername** (security) | The username to use when creating 
javax.jms.Connection when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
+| **connectionPassword** (security) | The password to use when creating 
javax.jms.Connection when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
+| **connectionClientId** (advanced) | The client ID to use when creating 
javax.jms.Connection when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
+| **connectionMaxWait** (advanced) | The max wait time in millis to block and 
wait on free connection when the pool is exhausted when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource. | 5000 | long
+| **headerFilterStrategy** (filter) | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message. |  | HeaderFilterStrategy
+| **resolveProperty Placeholders** (advanced) | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders. | true | boolean
 |=======================================================================
 // component options: END
 
@@ -139,86 +124,52 @@ with the following path and query parameters:
 
 #### Path Parameters (2 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| destinationType | queue | String | The kind of destination to use
-| destinationName |  | String | *Required* DestinationName is a JMS queue or 
topic name. By default the destinationName is interpreted as a queue name.
+| Name | Description | Default | Type
+| **destinationType** | The kind of destination to use | queue | String
+| **destinationName** | *Required* DestinationName is a JMS queue or topic 
name. By default the destinationName is interpreted as a queue name. |  | String
 |=======================================================================
 
 #### Query Parameters (34 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| acknowledgementMode | AUTO_ACKNOWLEDGE | SessionAcknowledgementType | The 
JMS acknowledgement name which is one of: SESSION_TRANSACTED CLIENT_ACKNOWLEDGE 
AUTO_ACKNOWLEDGE DUPS_OK_ACKNOWLEDGE
- 4+^s| consumer
-| bridgeErrorHandler | 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.
-
-| consumerCount | 1 | int | Sets the number of consumer listeners used for 
this endpoint.
-
-| durableSubscriptionId |  | String | Sets the durable subscription Id 
required for durable topics.
-
-| synchronous | true | boolean | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if supported).
- 4+^s| consumer (advanced)
-| exceptionHandler |  | 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 |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
-
-| messageSelector |  | String | Sets the JMS Message selector syntax.
- 4+^s| producer
-| namedReplyTo |  | String | Sets the reply to destination name used for InOut 
producer endpoints.
-
-| persistent | true | boolean | Flag used to enable/disable message 
persistence.
-
-| producerCount | 1 | int | Sets the number of producers used for this 
endpoint.
-
-| ttl | -1 | long | Flag used to adjust the Time To Live value of produced 
messages.
- 4+^s| producer (advanced)
-| allowNullBody | true | boolean | Whether to allow sending messages with no 
body. If this option is false and the message body is null then an JMSException 
is thrown.
-
-| prefillPool | true | boolean | Whether to prefill the producer connection 
pool on startup or create connections lazy when needed.
-
-| responseTimeOut | 5000 | long | Sets the amount of time we should wait 
before timing out a InOut response.
- 4+^s| advanced
-| asyncStartListener | false | boolean | Whether to startup the consumer 
message listener asynchronously when starting a route. For example if a 
JmsConsumer cannot get a connection to a remote JMS broker then it may block 
while retrying and/or failover. This will cause Camel to block while starting 
routes. By setting this option to true you will let routes startup while the 
JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous 
mode. If this option is used then beware that if the connection could not be 
established then an exception is logged at WARN level and the consumer will not 
be able to receive messages; You can then restart the route to retry.
-
-| asyncStopListener | false | boolean | Whether to stop the consumer message 
listener asynchronously when stopping a route.
-
-| connectionCount |  | Integer | The maximum number of connections available 
to this endpoint
-
-| connectionFactory |  | ConnectionFactory | Initializes the connectionFactory 
for the endpoint which takes precedence over the component's connectionFactory 
if any
-
-| connectionResource |  | ConnectionResource | Initializes the 
connectionResource for the endpoint which takes precedence over the component's 
connectionResource if any
-
-| destinationCreationStrategy |  | DestinationCreationStrategy | To use a 
custom DestinationCreationStrategy.
-
-| exceptionListener |  | ExceptionListener | Specifies the JMS Exception 
Listener that is to be notified of any underlying JMS exceptions.
-
-| headerFilterStrategy |  | HeaderFilterStrategy | To use a custom 
HeaderFilterStrategy to filter header to and from Camel message.
-
-| includeAllJMSXProperties | false | boolean | Whether to include all JMSXxxx 
properties when mapping from JMS to Camel Message. Setting this to true will 
include properties such as JMSXAppID and JMSXUserID etc. Note: If you are using 
a custom headerFilterStrategy then this option does not apply.
-
-| jmsKeyFormatStrategy |  | JmsKeyFormatStrategy | Pluggable strategy for 
encoding and decoding JMS keys so they can be compliant with the JMS 
specification. Camel provides two implementations out of the box: default and 
passthrough. The default strategy will safely marshal dots and hyphens (. and 
-). The passthrough strategy leaves the key as is. Can be used for JMS brokers 
which do not care whether JMS header keys contain illegal characters. You can 
provide your own implementation of the 
org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the 
notation.
-
-| mapJmsMessage | true | boolean | Specifies whether Camel should auto map the 
received JMS message to a suited payload type such as javax.jms.TextMessage to 
a String etc. See section about how mapping works below for more details.
-
-| messageCreatedStrategy |  | MessageCreatedStrategy | To use the given 
MessageCreatedStrategy which are invoked when Camel creates new instances of 
javax.jms.Message objects when Camel is sending a JMS message.
- 4+^s| logging
-| errorHandlerLoggingLevel | WARN | LoggingLevel | Allows to configure the 
default errorHandler logging level for logging uncaught exceptions.
-
-| errorHandlerLogStackTrace | true | boolean | Allows to control whether 
stacktraces should be logged or not by the default errorHandler.
- 4+^s| transaction
-| transacted | false | boolean | Specifies whether to use transacted mode
-
-| transactionBatchCount | -1 | int | If transacted sets the number of messages 
to process before committing a transaction.
-
-| transactionBatchTimeout | 5000 | long | Sets timeout (in millis) for batch 
transactions the value should be 1000 or higher.
-
-| transactionCommitStrategy |  | TransactionCommitStrategy | Sets the commit 
strategy.
- 4+^s| transaction (advanced)
-| sharedJMSSession | true | boolean | Specifies whether to share JMS session 
with other SJMS endpoints. Turn this off if your route is accessing to multiple 
JMS providers. If you need transaction against multiple JMS providers use jms 
component to leverage XA transaction.
+| Name | Description | Default | Type
+| **acknowledgementMode** (common) | The JMS acknowledgement name which is one 
of: SESSION_TRANSACTED CLIENT_ACKNOWLEDGE AUTO_ACKNOWLEDGE DUPS_OK_ACKNOWLEDGE 
| AUTO_ ACKNOWLEDGE | SessionAcknowledgement Type
+| **bridgeErrorHandler** (consumer) | 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. | false | 
boolean
+| **consumerCount** (consumer) | Sets the number of consumer listeners used 
for this endpoint. | 1 | int
+| **durableSubscriptionId** (consumer) | Sets the durable subscription Id 
required for durable topics. |  | String
+| **synchronous** (consumer) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | true | boolean
+| **exceptionHandler** (consumer) | 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. |  | ExceptionHandler
+| **exchangePattern** (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
+| **messageSelector** (consumer) | Sets the JMS Message selector syntax. |  | 
String
+| **namedReplyTo** (producer) | Sets the reply to destination name used for 
InOut producer endpoints. |  | String
+| **persistent** (producer) | Flag used to enable/disable message persistence. 
| true | boolean
+| **producerCount** (producer) | Sets the number of producers used for this 
endpoint. | 1 | int
+| **ttl** (producer) | Flag used to adjust the Time To Live value of produced 
messages. | -1 | long
+| **allowNullBody** (producer) | Whether to allow sending messages with no 
body. If this option is false and the message body is null then an JMSException 
is thrown. | true | boolean
+| **prefillPool** (producer) | Whether to prefill the producer connection pool 
on startup or create connections lazy when needed. | true | boolean
+| **responseTimeOut** (producer) | Sets the amount of time we should wait 
before timing out a InOut response. | 5000 | long
+| **asyncStartListener** (advanced) | Whether to startup the consumer message 
listener asynchronously when starting a route. For example if a JmsConsumer 
cannot get a connection to a remote JMS broker then it may block while retrying 
and/or failover. This will cause Camel to block while starting routes. By 
setting this option to true you will let routes startup while the JmsConsumer 
connects to the JMS broker using a dedicated thread in asynchronous mode. If 
this option is used then beware that if the connection could not be established 
then an exception is logged at WARN level and the consumer will not be able to 
receive messages; You can then restart the route to retry. | false | boolean
+| **asyncStopListener** (advanced) | Whether to stop the consumer message 
listener asynchronously when stopping a route. | false | boolean
+| **connectionCount** (advanced) | The maximum number of connections available 
to this endpoint |  | Integer
+| **connectionFactory** (advanced) | Initializes the connectionFactory for the 
endpoint which takes precedence over the component's connectionFactory if any | 
 | ConnectionFactory
+| **connectionResource** (advanced) | Initializes the connectionResource for 
the endpoint which takes precedence over the component's connectionResource if 
any |  | ConnectionResource
+| **destinationCreationStrategy** (advanced) | To use a custom 
DestinationCreationStrategy. |  | DestinationCreation Strategy
+| **exceptionListener** (advanced) | Specifies the JMS Exception Listener that 
is to be notified of any underlying JMS exceptions. |  | ExceptionListener
+| **headerFilterStrategy** (advanced) | To use a custom HeaderFilterStrategy 
to filter header to and from Camel message. |  | HeaderFilterStrategy
+| **includeAllJMSXProperties** (advanced) | Whether to include all JMSXxxx 
properties when mapping from JMS to Camel Message. Setting this to true will 
include properties such as JMSXAppID and JMSXUserID etc. Note: If you are using 
a custom headerFilterStrategy then this option does not apply. | false | boolean
+| **jmsKeyFormatStrategy** (advanced) | Pluggable strategy for encoding and 
decoding JMS keys so they can be compliant with the JMS specification. Camel 
provides two implementations out of the box: default and passthrough. The 
default strategy will safely marshal dots and hyphens (. and -). The 
passthrough strategy leaves the key as is. Can be used for JMS brokers which do 
not care whether JMS header keys contain illegal characters. You can provide 
your own implementation of the 
org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the 
notation. |  | JmsKeyFormatStrategy
+| **mapJmsMessage** (advanced) | Specifies whether Camel should auto map the 
received JMS message to a suited payload type such as javax.jms.TextMessage to 
a String etc. See section about how mapping works below for more details. | 
true | boolean
+| **messageCreatedStrategy** (advanced) | To use the given 
MessageCreatedStrategy which are invoked when Camel creates new instances of 
javax.jms.Message objects when Camel is sending a JMS message. |  | 
MessageCreatedStrategy
+| **errorHandlerLoggingLevel** (logging) | Allows to configure the default 
errorHandler logging level for logging uncaught exceptions. | WARN | 
LoggingLevel
+| **errorHandlerLogStackTrace** (logging) | Allows to control whether 
stacktraces should be logged or not by the default errorHandler. | true | 
boolean
+| **transacted** (transaction) | Specifies whether to use transacted mode | 
false | boolean
+| **transactionBatchCount** (transaction) | If transacted sets the number of 
messages to process before committing a transaction. | -1 | int
+| **transactionBatchTimeout** (transaction) | Sets timeout (in millis) for 
batch transactions the value should be 1000 or higher. | 5000 | long
+| **transactionCommitStrategy** (transaction) | Sets the commit strategy. |  | 
TransactionCommit Strategy
+| **sharedJMSSession** (transaction) | Specifies whether to share JMS session 
with other SJMS endpoints. Turn this off if your route is accessing to multiple 
JMS providers. If you need transaction against multiple JMS providers use jms 
component to leverage XA transaction. | true | boolean
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-sjms2/src/main/docs/sjms2-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-sjms2/src/main/docs/sjms2-component.adoc 
b/components/camel-sjms2/src/main/docs/sjms2-component.adoc
index 57145d3..c9da69a 100644
--- a/components/camel-sjms2/src/main/docs/sjms2-component.adoc
+++ b/components/camel-sjms2/src/main/docs/sjms2-component.adoc
@@ -87,39 +87,24 @@ The Simple JMS2 component supports 15 options which are 
listed below.
 
 
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| advanced
-| connectionFactory |  | ConnectionFactory | A ConnectionFactory is required 
to enable the SjmsComponent. It can be set directly or set set as part of a 
ConnectionResource.
-
-| connectionResource |  | ConnectionResource | A ConnectionResource is an 
interface that allows for customization and container control of the 
ConnectionFactory. See Plugable Connection Resource Management for further 
details.
- 4+^s| common
-| connectionCount | 1 | Integer | The maximum number of connections available 
to endpoints started under this component
- 4+^s| advanced
-| jmsKeyFormatStrategy |  | JmsKeyFormatStrategy | Pluggable strategy for 
encoding and decoding JMS keys so they can be compliant with the JMS 
specification. Camel provides one implementation out of the box: default. The 
default strategy will safely marshal dots and hyphens (. and -). Can be used 
for JMS brokers which do not care whether JMS header keys contain illegal 
characters. You can provide your own implementation of the 
org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the 
notation.
- 4+^s| transaction
-| transactionCommitStrategy |  | TransactionCommitStrategy | To configure 
which kind of commit strategy to use. Camel provides two implementations out of 
the box default and batch.
- 4+^s| advanced
-| destinationCreationStrategy |  | DestinationCreationStrategy | To use a 
custom DestinationCreationStrategy.
-
-| timedTaskManager |  | TimedTaskManager | To use a custom TimedTaskManager
-
-| messageCreatedStrategy |  | MessageCreatedStrategy | To use the given 
MessageCreatedStrategy which are invoked when Camel creates new instances of 
javax.jms.Message objects when Camel is sending a JMS message.
-
-| connectionTestOnBorrow | true | boolean | When using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource then should each 
javax.jms.Connection be tested (calling start) before returned from the pool.
- 4+^s| security
-| connectionUsername |  | String | The username to use when creating 
javax.jms.Connection when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
-
-| connectionPassword |  | String | The password to use when creating 
javax.jms.Connection when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
- 4+^s| advanced
-| connectionClientId |  | String | The client ID to use when creating 
javax.jms.Connection when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
-
-| connectionMaxWait | 5000 | long | The max wait time in millis to block and 
wait on free connection when the pool is exhausted when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
- 4+^s| filter
-| headerFilterStrategy |  | HeaderFilterStrategy | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message.
- 4+^s| advanced
-| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
+| Name | Description | Default | Type
+| **connectionFactory** (advanced) | A ConnectionFactory is required to enable 
the SjmsComponent. It can be set directly or set set as part of a 
ConnectionResource. |  | ConnectionFactory
+| **connectionResource** (advanced) | A ConnectionResource is an interface 
that allows for customization and container control of the ConnectionFactory. 
See Plugable Connection Resource Management for further details. |  | 
ConnectionResource
+| **connectionCount** (common) | The maximum number of connections available 
to endpoints started under this component | 1 | Integer
+| **jmsKeyFormatStrategy** (advanced) | Pluggable strategy for encoding and 
decoding JMS keys so they can be compliant with the JMS specification. Camel 
provides one implementation out of the box: default. The default strategy will 
safely marshal dots and hyphens (. and -). Can be used for JMS brokers which do 
not care whether JMS header keys contain illegal characters. You can provide 
your own implementation of the 
org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the 
notation. |  | JmsKeyFormatStrategy
+| **transactionCommit Strategy** (transaction) | To configure which kind of 
commit strategy to use. Camel provides two implementations out of the box 
default and batch. |  | TransactionCommit Strategy
+| **destinationCreation Strategy** (advanced) | To use a custom 
DestinationCreationStrategy. |  | DestinationCreation Strategy
+| **timedTaskManager** (advanced) | To use a custom TimedTaskManager |  | 
TimedTaskManager
+| **messageCreatedStrategy** (advanced) | To use the given 
MessageCreatedStrategy which are invoked when Camel creates new instances of 
javax.jms.Message objects when Camel is sending a JMS message. |  | 
MessageCreatedStrategy
+| **connectionTestOnBorrow** (advanced) | When using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource then should each 
javax.jms.Connection be tested (calling start) before returned from the pool. | 
true | boolean
+| **connectionUsername** (security) | The username to use when creating 
javax.jms.Connection when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
+| **connectionPassword** (security) | The password to use when creating 
javax.jms.Connection when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
+| **connectionClientId** (advanced) | The client ID to use when creating 
javax.jms.Connection when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
+| **connectionMaxWait** (advanced) | The max wait time in millis to block and 
wait on free connection when the pool is exhausted when using the default 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource. | 5000 | long
+| **headerFilterStrategy** (filter) | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message. |  | HeaderFilterStrategy
+| **resolveProperty Placeholders** (advanced) | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders. | true | boolean
 |=======================================================================
 // component options: END
 
@@ -139,92 +124,55 @@ with the following path and query parameters:
 
 #### Path Parameters (2 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| destinationType | queue | String | The kind of destination to use
-| destinationName |  | String | *Required* DestinationName is a JMS queue or 
topic name. By default the destinationName is interpreted as a queue name.
+| Name | Description | Default | Type
+| **destinationType** | The kind of destination to use | queue | String
+| **destinationName** | *Required* DestinationName is a JMS queue or topic 
name. By default the destinationName is interpreted as a queue name. |  | String
 |=======================================================================
 
 #### Query Parameters (37 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| acknowledgementMode | AUTO_ACKNOWLEDGE | SessionAcknowledgementType | The 
JMS acknowledgement name which is one of: SESSION_TRANSACTED CLIENT_ACKNOWLEDGE 
AUTO_ACKNOWLEDGE DUPS_OK_ACKNOWLEDGE
- 4+^s| consumer
-| bridgeErrorHandler | 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.
-
-| consumerCount | 1 | int | Sets the number of consumer listeners used for 
this endpoint.
-
-| durable | false | boolean | Sets topic consumer to durable.
-
-| durableSubscriptionId |  | String | Sets the durable subscription Id 
required for durable topics.
-
-| shared | false | boolean | Sets the consumer to shared.
-
-| subscriptionId |  | String | Sets the subscription Id required for durable 
or shared topics.
-
-| synchronous | true | boolean | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if supported).
- 4+^s| consumer (advanced)
-| exceptionHandler |  | 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 |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
-
-| messageSelector |  | String | Sets the JMS Message selector syntax.
- 4+^s| producer
-| namedReplyTo |  | String | Sets the reply to destination name used for InOut 
producer endpoints.
-
-| persistent | true | boolean | Flag used to enable/disable message 
persistence.
-
-| producerCount | 1 | int | Sets the number of producers used for this 
endpoint.
-
-| ttl | -1 | long | Flag used to adjust the Time To Live value of produced 
messages.
- 4+^s| producer (advanced)
-| allowNullBody | true | boolean | Whether to allow sending messages with no 
body. If this option is false and the message body is null then an JMSException 
is thrown.
-
-| prefillPool | true | boolean | Whether to prefill the producer connection 
pool on startup or create connections lazy when needed.
-
-| responseTimeOut | 5000 | long | Sets the amount of time we should wait 
before timing out a InOut response.
- 4+^s| advanced
-| asyncStartListener | false | boolean | Whether to startup the consumer 
message listener asynchronously when starting a route. For example if a 
JmsConsumer cannot get a connection to a remote JMS broker then it may block 
while retrying and/or failover. This will cause Camel to block while starting 
routes. By setting this option to true you will let routes startup while the 
JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous 
mode. If this option is used then beware that if the connection could not be 
established then an exception is logged at WARN level and the consumer will not 
be able to receive messages; You can then restart the route to retry.
-
-| asyncStopListener | false | boolean | Whether to stop the consumer message 
listener asynchronously when stopping a route.
-
-| connectionCount |  | Integer | The maximum number of connections available 
to this endpoint
-
-| connectionFactory |  | ConnectionFactory | Initializes the connectionFactory 
for the endpoint which takes precedence over the component's connectionFactory 
if any
-
-| connectionResource |  | ConnectionResource | Initializes the 
connectionResource for the endpoint which takes precedence over the component's 
connectionResource if any
-
-| destinationCreationStrategy |  | DestinationCreationStrategy | To use a 
custom DestinationCreationStrategy.
-
-| exceptionListener |  | ExceptionListener | Specifies the JMS Exception 
Listener that is to be notified of any underlying JMS exceptions.
-
-| headerFilterStrategy |  | HeaderFilterStrategy | To use a custom 
HeaderFilterStrategy to filter header to and from Camel message.
-
-| includeAllJMSXProperties | false | boolean | Whether to include all JMSXxxx 
properties when mapping from JMS to Camel Message. Setting this to true will 
include properties such as JMSXAppID and JMSXUserID etc. Note: If you are using 
a custom headerFilterStrategy then this option does not apply.
-
-| jmsKeyFormatStrategy |  | JmsKeyFormatStrategy | Pluggable strategy for 
encoding and decoding JMS keys so they can be compliant with the JMS 
specification. Camel provides two implementations out of the box: default and 
passthrough. The default strategy will safely marshal dots and hyphens (. and 
-). The passthrough strategy leaves the key as is. Can be used for JMS brokers 
which do not care whether JMS header keys contain illegal characters. You can 
provide your own implementation of the 
org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the 
notation.
-
-| mapJmsMessage | true | boolean | Specifies whether Camel should auto map the 
received JMS message to a suited payload type such as javax.jms.TextMessage to 
a String etc. See section about how mapping works below for more details.
-
-| messageCreatedStrategy |  | MessageCreatedStrategy | To use the given 
MessageCreatedStrategy which are invoked when Camel creates new instances of 
javax.jms.Message objects when Camel is sending a JMS message.
- 4+^s| logging
-| errorHandlerLoggingLevel | WARN | LoggingLevel | Allows to configure the 
default errorHandler logging level for logging uncaught exceptions.
-
-| errorHandlerLogStackTrace | true | boolean | Allows to control whether 
stacktraces should be logged or not by the default errorHandler.
- 4+^s| transaction
-| transacted | false | boolean | Specifies whether to use transacted mode
-
-| transactionBatchCount | -1 | int | If transacted sets the number of messages 
to process before committing a transaction.
-
-| transactionBatchTimeout | 5000 | long | Sets timeout (in millis) for batch 
transactions the value should be 1000 or higher.
-
-| transactionCommitStrategy |  | TransactionCommitStrategy | Sets the commit 
strategy.
- 4+^s| transaction (advanced)
-| sharedJMSSession | true | boolean | Specifies whether to share JMS session 
with other SJMS endpoints. Turn this off if your route is accessing to multiple 
JMS providers. If you need transaction against multiple JMS providers use jms 
component to leverage XA transaction.
+| Name | Description | Default | Type
+| **acknowledgementMode** (common) | The JMS acknowledgement name which is one 
of: SESSION_TRANSACTED CLIENT_ACKNOWLEDGE AUTO_ACKNOWLEDGE DUPS_OK_ACKNOWLEDGE 
| AUTO_ ACKNOWLEDGE | SessionAcknowledgement Type
+| **bridgeErrorHandler** (consumer) | 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. | false | 
boolean
+| **consumerCount** (consumer) | Sets the number of consumer listeners used 
for this endpoint. | 1 | int
+| **durable** (consumer) | Sets topic consumer to durable. | false | boolean
+| **durableSubscriptionId** (consumer) | Sets the durable subscription Id 
required for durable topics. |  | String
+| **shared** (consumer) | Sets the consumer to shared. | false | boolean
+| **subscriptionId** (consumer) | Sets the subscription Id required for 
durable or shared topics. |  | String
+| **synchronous** (consumer) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | true | boolean
+| **exceptionHandler** (consumer) | 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. |  | ExceptionHandler
+| **exchangePattern** (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
+| **messageSelector** (consumer) | Sets the JMS Message selector syntax. |  | 
String
+| **namedReplyTo** (producer) | Sets the reply to destination name used for 
InOut producer endpoints. |  | String
+| **persistent** (producer) | Flag used to enable/disable message persistence. 
| true | boolean
+| **producerCount** (producer) | Sets the number of producers used for this 
endpoint. | 1 | int
+| **ttl** (producer) | Flag used to adjust the Time To Live value of produced 
messages. | -1 | long
+| **allowNullBody** (producer) | Whether to allow sending messages with no 
body. If this option is false and the message body is null then an JMSException 
is thrown. | true | boolean
+| **prefillPool** (producer) | Whether to prefill the producer connection pool 
on startup or create connections lazy when needed. | true | boolean
+| **responseTimeOut** (producer) | Sets the amount of time we should wait 
before timing out a InOut response. | 5000 | long
+| **asyncStartListener** (advanced) | Whether to startup the consumer message 
listener asynchronously when starting a route. For example if a JmsConsumer 
cannot get a connection to a remote JMS broker then it may block while retrying 
and/or failover. This will cause Camel to block while starting routes. By 
setting this option to true you will let routes startup while the JmsConsumer 
connects to the JMS broker using a dedicated thread in asynchronous mode. If 
this option is used then beware that if the connection could not be established 
then an exception is logged at WARN level and the consumer will not be able to 
receive messages; You can then restart the route to retry. | false | boolean
+| **asyncStopListener** (advanced) | Whether to stop the consumer message 
listener asynchronously when stopping a route. | false | boolean
+| **connectionCount** (advanced) | The maximum number of connections available 
to this endpoint |  | Integer
+| **connectionFactory** (advanced) | Initializes the connectionFactory for the 
endpoint which takes precedence over the component's connectionFactory if any | 
 | ConnectionFactory
+| **connectionResource** (advanced) | Initializes the connectionResource for 
the endpoint which takes precedence over the component's connectionResource if 
any |  | ConnectionResource
+| **destinationCreationStrategy** (advanced) | To use a custom 
DestinationCreationStrategy. |  | DestinationCreation Strategy
+| **exceptionListener** (advanced) | Specifies the JMS Exception Listener that 
is to be notified of any underlying JMS exceptions. |  | ExceptionListener
+| **headerFilterStrategy** (advanced) | To use a custom HeaderFilterStrategy 
to filter header to and from Camel message. |  | HeaderFilterStrategy
+| **includeAllJMSXProperties** (advanced) | Whether to include all JMSXxxx 
properties when mapping from JMS to Camel Message. Setting this to true will 
include properties such as JMSXAppID and JMSXUserID etc. Note: If you are using 
a custom headerFilterStrategy then this option does not apply. | false | boolean
+| **jmsKeyFormatStrategy** (advanced) | Pluggable strategy for encoding and 
decoding JMS keys so they can be compliant with the JMS specification. Camel 
provides two implementations out of the box: default and passthrough. The 
default strategy will safely marshal dots and hyphens (. and -). The 
passthrough strategy leaves the key as is. Can be used for JMS brokers which do 
not care whether JMS header keys contain illegal characters. You can provide 
your own implementation of the 
org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the 
notation. |  | JmsKeyFormatStrategy
+| **mapJmsMessage** (advanced) | Specifies whether Camel should auto map the 
received JMS message to a suited payload type such as javax.jms.TextMessage to 
a String etc. See section about how mapping works below for more details. | 
true | boolean
+| **messageCreatedStrategy** (advanced) | To use the given 
MessageCreatedStrategy which are invoked when Camel creates new instances of 
javax.jms.Message objects when Camel is sending a JMS message. |  | 
MessageCreatedStrategy
+| **errorHandlerLoggingLevel** (logging) | Allows to configure the default 
errorHandler logging level for logging uncaught exceptions. | WARN | 
LoggingLevel
+| **errorHandlerLogStackTrace** (logging) | Allows to control whether 
stacktraces should be logged or not by the default errorHandler. | true | 
boolean
+| **transacted** (transaction) | Specifies whether to use transacted mode | 
false | boolean
+| **transactionBatchCount** (transaction) | If transacted sets the number of 
messages to process before committing a transaction. | -1 | int
+| **transactionBatchTimeout** (transaction) | Sets timeout (in millis) for 
batch transactions the value should be 1000 or higher. | 5000 | long
+| **transactionCommitStrategy** (transaction) | Sets the commit strategy. |  | 
TransactionCommit Strategy
+| **sharedJMSSession** (transaction) | Specifies whether to share JMS session 
with other SJMS endpoints. Turn this off if your route is accessing to multiple 
JMS providers. If you need transaction against multiple JMS providers use jms 
component to leverage XA transaction. | true | boolean
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-slack/src/main/docs/slack-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-slack/src/main/docs/slack-component.adoc 
b/components/camel-slack/src/main/docs/slack-component.adoc
index 2a644b6..0302eb5 100644
--- a/components/camel-slack/src/main/docs/slack-component.adoc
+++ b/components/camel-slack/src/main/docs/slack-component.adoc
@@ -46,13 +46,11 @@ The Slack component supports 2 options which are listed 
below.
 
 
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| producer
-| webhookUrl |  | String | The incoming webhook URL
- 4+^s| advanced
-| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
+| Name | Description | Default | Type
+| **webhookUrl** (producer) | The incoming webhook URL |  | String
+| **resolveProperty Placeholders** (advanced) | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders. | true | boolean
 |=======================================================================
 // component options: END
 
@@ -68,27 +66,22 @@ with the following path and query parameters:
 
 #### Path Parameters (1 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| channel |  | String | *Required* The channel name (syntax name) or slackuser 
(syntax userName) to send a message directly to an user.
+| Name | Description | Default | Type
+| **channel** | *Required* The channel name (syntax name) or slackuser (syntax 
userName) to send a message directly to an user. |  | String
 |=======================================================================
 
 #### Query Parameters (5 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| iconEmoji |  | String | Use a Slack emoji as an avatar
-
-| iconUrl |  | String | The avatar that the component will use when sending 
message to a channel or user.
-
-| username |  | String | This is the username that the bot will have when 
sending messages to a channel or user.
-
-| webhookUrl |  | String | The incoming webhook URL
- 4+^s| advanced
-| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
+| Name | Description | Default | Type
+| **iconEmoji** (producer) | Use a Slack emoji as an avatar |  | String
+| **iconUrl** (producer) | The avatar that the component will use when sending 
message to a channel or user. |  | String
+| **username** (producer) | This is the username that the bot will have when 
sending messages to a channel or user. |  | String
+| **webhookUrl** (producer) | The incoming webhook URL |  | String
+| **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-smpp/src/main/docs/smpp-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/main/docs/smpp-component.adoc 
b/components/camel-smpp/src/main/docs/smpp-component.adoc
index 6eefea7..bc166a7 100644
--- a/components/camel-smpp/src/main/docs/smpp-component.adoc
+++ b/components/camel-smpp/src/main/docs/smpp-component.adoc
@@ -171,13 +171,11 @@ The SMPP component supports 2 options which are listed 
below.
 
 
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| advanced
-| configuration |  | SmppConfiguration | To use the shared SmppConfiguration 
as configuration.
-
-| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
+| Name | Description | Default | Type
+| **configuration** (advanced) | To use the shared SmppConfiguration as 
configuration. |  | SmppConfiguration
+| **resolveProperty Placeholders** (advanced) | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders. | true | boolean
 |=======================================================================
 // component options: END
 
@@ -195,94 +193,56 @@ with the following path and query parameters:
 
 #### Path Parameters (2 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| host | localhost | String | Hostname for the SMSC server to use.
-| port | 2775 | Integer | Port number for the SMSC server to use.
+| Name | Description | Default | Type
+| **host** | Hostname for the SMSC server to use. | localhost | String
+| **port** | Port number for the SMSC server to use. | 2775 | Integer
 |=======================================================================
 
 #### Query Parameters (38 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| initialReconnectDelay | 5000 | long | Defines the initial delay in 
milliseconds after the consumer/producer tries to reconnect to the SMSC after 
the connection was lost.
-
-| maxReconnect | 2147483647 | int | Defines the maximum number of attempts to 
reconnect to the SMSC if SMSC returns a negative bind response
-
-| reconnectDelay | 5000 | long | Defines the interval in milliseconds between 
the reconnect attempts if the connection to the SMSC was lost and the previous 
was not succeed.
-
-| splittingPolicy | ALLOW | SmppSplittingPolicy | You can specify a policy for 
handling long messages: ALLOW - the default long messages are split to 140 
bytes per message TRUNCATE - long messages are split and only the first 
fragment will be sent to the SMSC. Some carriers drop subsequent fragments so 
this reduces load on the SMPP connection sending parts of a message that will 
never be delivered. REJECT - if a message would need to be split it is rejected 
with an SMPP NegativeResponseException and the reason code signifying the 
message is too long.
-
-| systemType | cp | String | This parameter is used to categorize the type of 
ESME (External Short Message Entity) that is binding to the SMSC (max. 13 
characters).
- 4+^s| consumer
-| addressRange |  | String | You can specify the address range for the 
SmppConsumer as defined in section 5.2.7 of the SMPP 3.4 specification. The 
SmppConsumer will receive messages only from SMSC's which target an address 
(MSISDN or IP address) within this range.
-
-| bridgeErrorHandler | 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.
- 4+^s| consumer (advanced)
-| exceptionHandler |  | 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 |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
- 4+^s| producer
-| destAddr | 1717 | String | Defines the destination SME address. For mobile 
terminated messages this is the directory number of the recipient MS. Only for 
SubmitSm SubmitMulti CancelSm and DataSm.
-
-| destAddrNpi |  | byte | Defines the type of number (TON) to be used in the 
SME destination address parameters. Only for SubmitSm SubmitMulti CancelSm and 
DataSm. The following NPI values are defined: 0: Unknown 1: ISDN (E163/E164) 2: 
Data (X.121) 3: Telex (F.69) 6: Land Mobile (E.212) 8: National 9: Private 10: 
ERMES 13: Internet (IP) 18: WAP Client Id (to be defined by WAP Forum)
-
-| destAddrTon |  | byte | Defines the type of number (TON) to be used in the 
SME destination address parameters. Only for SubmitSm SubmitMulti CancelSm and 
DataSm. The following TON values are defined: 0: Unknown 1: International 2: 
National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: Abbreviated
-
-| lazySessionCreation | false | boolean | Sessions can be lazily created to 
avoid exceptions if the SMSC is not available when the Camel producer is 
started. Camel will check the in message headers 'CamelSmppSystemId' and 
'CamelSmppPassword' of the first exchange. If they are present Camel will use 
these data to connect to the SMSC.
-
-| numberingPlanIndicator |  | byte | Defines the numeric plan indicator (NPI) 
to be used in the SME. The following NPI values are defined: 0: Unknown 1: ISDN 
(E163/E164) 2: Data (X.121) 3: Telex (F.69) 6: Land Mobile (E.212) 8: National 
9: Private 10: ERMES 13: Internet (IP) 18: WAP Client Id (to be defined by WAP 
Forum)
-
-| priorityFlag |  | byte | Allows the originating SME to assign a priority 
level to the short message. Only for SubmitSm and SubmitMulti. Four Priority 
Levels are supported: 0: Level 0 (lowest) priority 1: Level 1 priority 2: Level 
2 priority 3: Level 3 (highest) priority
-
-| protocolId |  | byte | The protocol id
-
-| registeredDelivery |  | byte | Is used to request an SMSC delivery receipt 
and/or SME originated acknowledgements. The following values are defined: 0: No 
SMSC delivery receipt requested. 1: SMSC delivery receipt requested where final 
delivery outcome is success or failure. 2: SMSC delivery receipt requested 
where the final delivery outcome is delivery failure.
-
-| replaceIfPresentFlag |  | byte | Used to request the SMSC to replace a 
previously submitted message that is still pending delivery. The SMSC will 
replace an existing message provided that the source address destination 
address and service type match the same fields in the new message. The 
following replace if present flag values are defined: 0: Don't replace 1: 
Replace
-
-| serviceType | CMT | String | The service type parameter can be used to 
indicate the SMS Application service associated with the message. The following 
generic service_types are defined: CMT: Cellular Messaging CPT: Cellular Paging 
VMN: Voice Mail Notification VMA: Voice Mail Alerting WAP: Wireless Application 
Protocol USSD: Unstructured Supplementary Services Data
-
-| sourceAddr | 1616 | String | Defines the address of SME (Short Message 
Entity) which originated this message.
-
-| sourceAddrNpi |  | byte | Defines the numeric plan indicator (NPI) to be 
used in the SME originator address parameters. The following NPI values are 
defined: 0: Unknown 1: ISDN (E163/E164) 2: Data (X.121) 3: Telex (F.69) 6: Land 
Mobile (E.212) 8: National 9: Private 10: ERMES 13: Internet (IP) 18: WAP 
Client Id (to be defined by WAP Forum)
-
-| sourceAddrTon |  | byte | Defines the type of number (TON) to be used in the 
SME originator address parameters. The following TON values are defined: 0: 
Unknown 1: International 2: National 3: Network Specific 4: Subscriber Number 
5: Alphanumeric 6: Abbreviated
-
-| typeOfNumber |  | byte | Defines the type of number (TON) to be used in the 
SME. The following TON values are defined: 0: Unknown 1: International 2: 
National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: Abbreviated
- 4+^s| advanced
-| enquireLinkTimer | 5000 | Integer | Defines the interval in milliseconds 
between the confidence checks. The confidence check is used to test the 
communication path between an ESME and an SMSC.
-
-| sessionStateListener |  | SessionStateListener | You can refer to a 
org.jsmpp.session.SessionStateListener in the Registry to receive callbacks 
when the session state changed.
-
-| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
-
-| transactionTimer | 10000 | Integer | Defines the maximum period of 
inactivity allowed after a transaction after which an SMPP entity may assume 
that the session is no longer active. This timer may be active on either 
communicating SMPP entity (i.e. SMSC or ESME).
- 4+^s| codec
-| alphabet |  | byte | Defines encoding of data according the SMPP 3.4 
specification section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: 
UCS2 Alphabet
-
-| dataCoding |  | byte | Defines the data coding according the SMPP 3.4 
specification section 5.2.19. Example data encodings are: 0: SMSC Default 
Alphabet 3: Latin 1 (ISO-8859-1) 4: Octet unspecified (8-bit binary) 8: UCS2 
(ISO/IEC-10646) 13: Extended Kanji JIS(X 0212-1990)
-
-| encoding | ISO-8859-1 | String | Defines the encoding scheme of the short 
message user data. Only for SubmitSm ReplaceSm and SubmitMulti.
- 4+^s| proxy
-| httpProxyHost |  | String | If you need to tunnel SMPP through a HTTP proxy 
set this attribute to the hostname or ip address of your HTTP proxy.
-
-| httpProxyPassword |  | String | If your HTTP proxy requires basic 
authentication set this attribute to the password required for your HTTP proxy.
-
-| httpProxyPort | 3128 | Integer | If you need to tunnel SMPP through a HTTP 
proxy set this attribute to the port of your HTTP proxy.
-
-| httpProxyUsername |  | String | If your HTTP proxy requires basic 
authentication set this attribute to the username required for your HTTP proxy.
-
-| proxyHeaders |  | Map | These headers will be passed to the proxy server 
while establishing the connection.
- 4+^s| security
-| password |  | String | The password for connecting to SMSC server.
-
-| systemId | smppclient | String | The system id (username) for connecting to 
SMSC server.
-
-| usingSSL | false | boolean | Whether using SSL with the smpps protocol
+| Name | Description | Default | Type
+| **initialReconnectDelay** (common) | Defines the initial delay in 
milliseconds after the consumer/producer tries to reconnect to the SMSC after 
the connection was lost. | 5000 | long
+| **maxReconnect** (common) | Defines the maximum number of attempts to 
reconnect to the SMSC if SMSC returns a negative bind response | 2147483647 | 
int
+| **reconnectDelay** (common) | Defines the interval in milliseconds between 
the reconnect attempts if the connection to the SMSC was lost and the previous 
was not succeed. | 5000 | long
+| **splittingPolicy** (common) | You can specify a policy for handling long 
messages: ALLOW - the default long messages are split to 140 bytes per message 
TRUNCATE - long messages are split and only the first fragment will be sent to 
the SMSC. Some carriers drop subsequent fragments so this reduces load on the 
SMPP connection sending parts of a message that will never be delivered. REJECT 
- if a message would need to be split it is rejected with an SMPP 
NegativeResponseException and the reason code signifying the message is too 
long. | ALLOW | SmppSplittingPolicy
+| **systemType** (common) | This parameter is used to categorize the type of 
ESME (External Short Message Entity) that is binding to the SMSC (max. 13 
characters). | cp | String
+| **addressRange** (consumer) | You can specify the address range for the 
SmppConsumer as defined in section 5.2.7 of the SMPP 3.4 specification. The 
SmppConsumer will receive messages only from SMSC's which target an address 
(MSISDN or IP address) within this range. |  | String
+| **bridgeErrorHandler** (consumer) | 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. | false | 
boolean
+| **exceptionHandler** (consumer) | 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. |  | ExceptionHandler
+| **exchangePattern** (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
+| **destAddr** (producer) | Defines the destination SME address. For mobile 
terminated messages this is the directory number of the recipient MS. Only for 
SubmitSm SubmitMulti CancelSm and DataSm. | 1717 | String
+| **destAddrNpi** (producer) | Defines the type of number (TON) to be used in 
the SME destination address parameters. Only for SubmitSm SubmitMulti CancelSm 
and DataSm. The following NPI values are defined: 0: Unknown 1: ISDN 
(E163/E164) 2: Data (X.121) 3: Telex (F.69) 6: Land Mobile (E.212) 8: National 
9: Private 10: ERMES 13: Internet (IP) 18: WAP Client Id (to be defined by WAP 
Forum) |  | byte
+| **destAddrTon** (producer) | Defines the type of number (TON) to be used in 
the SME destination address parameters. Only for SubmitSm SubmitMulti CancelSm 
and DataSm. The following TON values are defined: 0: Unknown 1: International 
2: National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: 
Abbreviated |  | byte
+| **lazySessionCreation** (producer) | Sessions can be lazily created to avoid 
exceptions if the SMSC is not available when the Camel producer is started. 
Camel will check the in message headers 'CamelSmppSystemId' and 
'CamelSmppPassword' of the first exchange. If they are present Camel will use 
these data to connect to the SMSC. | false | boolean
+| **numberingPlanIndicator** (producer) | Defines the numeric plan indicator 
(NPI) to be used in the SME. The following NPI values are defined: 0: Unknown 
1: ISDN (E163/E164) 2: Data (X.121) 3: Telex (F.69) 6: Land Mobile (E.212) 8: 
National 9: Private 10: ERMES 13: Internet (IP) 18: WAP Client Id (to be 
defined by WAP Forum) |  | byte
+| **priorityFlag** (producer) | Allows the originating SME to assign a 
priority level to the short message. Only for SubmitSm and SubmitMulti. Four 
Priority Levels are supported: 0: Level 0 (lowest) priority 1: Level 1 priority 
2: Level 2 priority 3: Level 3 (highest) priority |  | byte
+| **protocolId** (producer) | The protocol id |  | byte
+| **registeredDelivery** (producer) | Is used to request an SMSC delivery 
receipt and/or SME originated acknowledgements. The following values are 
defined: 0: No SMSC delivery receipt requested. 1: SMSC delivery receipt 
requested where final delivery outcome is success or failure. 2: SMSC delivery 
receipt requested where the final delivery outcome is delivery failure. |  | 
byte
+| **replaceIfPresentFlag** (producer) | Used to request the SMSC to replace a 
previously submitted message that is still pending delivery. The SMSC will 
replace an existing message provided that the source address destination 
address and service type match the same fields in the new message. The 
following replace if present flag values are defined: 0: Don't replace 1: 
Replace |  | byte
+| **serviceType** (producer) | The service type parameter can be used to 
indicate the SMS Application service associated with the message. The following 
generic service_types are defined: CMT: Cellular Messaging CPT: Cellular Paging 
VMN: Voice Mail Notification VMA: Voice Mail Alerting WAP: Wireless Application 
Protocol USSD: Unstructured Supplementary Services Data | CMT | String
+| **sourceAddr** (producer) | Defines the address of SME (Short Message 
Entity) which originated this message. | 1616 | String
+| **sourceAddrNpi** (producer) | Defines the numeric plan indicator (NPI) to 
be used in the SME originator address parameters. The following NPI values are 
defined: 0: Unknown 1: ISDN (E163/E164) 2: Data (X.121) 3: Telex (F.69) 6: Land 
Mobile (E.212) 8: National 9: Private 10: ERMES 13: Internet (IP) 18: WAP 
Client Id (to be defined by WAP Forum) |  | byte
+| **sourceAddrTon** (producer) | Defines the type of number (TON) to be used 
in the SME originator address parameters. The following TON values are defined: 
0: Unknown 1: International 2: National 3: Network Specific 4: Subscriber 
Number 5: Alphanumeric 6: Abbreviated |  | byte
+| **typeOfNumber** (producer) | Defines the type of number (TON) to be used in 
the SME. The following TON values are defined: 0: Unknown 1: International 2: 
National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: 
Abbreviated |  | byte
+| **enquireLinkTimer** (advanced) | Defines the interval in milliseconds 
between the confidence checks. The confidence check is used to test the 
communication path between an ESME and an SMSC. | 5000 | Integer
+| **sessionStateListener** (advanced) | You can refer to a 
org.jsmpp.session.SessionStateListener in the Registry to receive callbacks 
when the session state changed. |  | SessionStateListener
+| **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
+| **transactionTimer** (advanced) | Defines the maximum period of inactivity 
allowed after a transaction after which an SMPP entity may assume that the 
session is no longer active. This timer may be active on either communicating 
SMPP entity (i.e. SMSC or ESME). | 10000 | Integer
+| **alphabet** (codec) | Defines encoding of data according the SMPP 3.4 
specification section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: 
UCS2 Alphabet |  | byte
+| **dataCoding** (codec) | Defines the data coding according the SMPP 3.4 
specification section 5.2.19. Example data encodings are: 0: SMSC Default 
Alphabet 3: Latin 1 (ISO-8859-1) 4: Octet unspecified (8-bit binary) 8: UCS2 
(ISO/IEC-10646) 13: Extended Kanji JIS(X 0212-1990) |  | byte
+| **encoding** (codec) | Defines the encoding scheme of the short message user 
data. Only for SubmitSm ReplaceSm and SubmitMulti. | ISO-8859-1 | String
+| **httpProxyHost** (proxy) | If you need to tunnel SMPP through a HTTP proxy 
set this attribute to the hostname or ip address of your HTTP proxy. |  | String
+| **httpProxyPassword** (proxy) | If your HTTP proxy requires basic 
authentication set this attribute to the password required for your HTTP proxy. 
|  | String
+| **httpProxyPort** (proxy) | If you need to tunnel SMPP through a HTTP proxy 
set this attribute to the port of your HTTP proxy. | 3128 | Integer
+| **httpProxyUsername** (proxy) | If your HTTP proxy requires basic 
authentication set this attribute to the username required for your HTTP proxy. 
|  | String
+| **proxyHeaders** (proxy) | These headers will be passed to the proxy server 
while establishing the connection. |  | Map
+| **password** (security) | The password for connecting to SMSC server. |  | 
String
+| **systemId** (security) | The system id (username) for connecting to SMSC 
server. | smppclient | String
+| **usingSSL** (security) | Whether using SSL with the smpps protocol | false 
| boolean
 |=======================================================================
 // endpoint options: END
 

Reply via email to