camel git commit: Component docs - Adjust tables as the previous attempt did not look so good.

2017-03-17 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 70ec4ac4f -> 844f309a1


Component docs - Adjust tables as the previous attempt did not look so good.


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

Branch: refs/heads/master
Commit: 844f309a14fdc68cbbba743a7aaaf8845c6fdc18
Parents: 70ec4ac
Author: Claus Ibsen 
Authored: Fri Mar 17 13:59:58 2017 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 17 13:59:58 2017 +0100

--
 .../camel-jms/src/main/docs/jms-component.adoc  | 34 ++--
 .../src/main/resources/component-options.mvel   |  2 +-
 .../src/main/resources/endpoint-options.mvel|  4 +--
 3 files changed, 20 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/844f309a/components/camel-jms/src/main/docs/jms-component.adoc
--
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc 
b/components/camel-jms/src/main/docs/jms-component.adoc
index d15d6ff..a0d50b2 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -234,15 +234,15 @@ The JMS component supports 75 options which are listed 
below.
 | **idleTaskExecutionLimit** (advanced) | 1 | Specifies the limit for idle 
executions of a receive task not having received any message within its 
execution. If this limit is reached the task will shut down and leave receiving 
to other executing tasks (in the case of dynamic scheduling; see the 
maxConcurrentConsumers setting). There is additional doc available from Spring. 
| int
 | **idleConsumerLimit** (advanced) | 1 | Specify the limit for the number of 
consumers that are allowed to be idle at any given time. | int
 | **maxConcurrentConsumers** (consumer) |  | Specifies the maximum number of 
concurrent consumers when consuming from JMS (not for request/reply over JMS). 
See also the maxMessagesPerTask option to control dynamic scaling up/down of 
threads. When doing request/reply over JMS then the option 
replyToMaxConcurrentConsumers is used to control number of concurrent consumers 
on the reply message listener. | int
-| **replyToMaxConcurrentConsumers** (producer) |  | Specifies the maximum 
number of concurrent consumers when using request/reply over JMS. See also the 
maxMessagesPerTask option to control dynamic scaling up/down of threads. | int
-| **replyOnTimeoutToMaxConcurrent Consumers** (producer) | 1 | Specifies the 
maximum number of concurrent consumers for continue routing when timeout 
occurred when using request/reply over JMS. | int
+| **replyToMaxConcurrent Consumers** (producer) |  | Specifies the maximum 
number of concurrent consumers when using request/reply over JMS. See also the 
maxMessagesPerTask option to control dynamic scaling up/down of threads. | int
+| **replyOnTimeoutToMax ConcurrentConsumers** (producer) | 1 | Specifies the 
maximum number of concurrent consumers for continue routing when timeout 
occurred when using request/reply over JMS. | int
 | **maxMessagesPerTask** (advanced) | -1 | The number of messages per task. -1 
is unlimited. If you use a range for concurrent consumers (eg min max) then 
this option can be used to set a value to eg 100 to control how fast the 
consumers will shrink when less work is required. | int
 | **messageConverter** (advanced) |  | To use a custom Spring 
org.springframework.jms.support.converter.MessageConverter so you can be in 
control how to map to/from a javax.jms.Message. | MessageConverter
 | **mapJmsMessage** (advanced) | true | 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. | boolean
 | **messageIdEnabled** (advanced) | true | When sending specifies whether 
message IDs should be added. This is just an hint to the JMS Broker. If the JMS 
provider accepts this hint these messages must have the message ID set to null; 
if the provider ignores the hint the message ID must be set to its normal 
unique value | boolean
 | **messageTimestampEnabled** (advanced) | true | Specifies whether timestamps 
should be enabled by default on sending messages. | boolean
 | **alwaysCopyMessage** (producer) | false | If true Camel will always make a 
JMS message copy of the message when it is passed to the producer for sending. 
Copying the message is needed in some situations such as when a 
replyToDestinationSelectorName is set (incidentally Camel will set the 
alwaysCopyMessage option to true if a

[2/3] camel git commit: Component docs - Adjust tables as the previous attempt did not look so good.

2017-03-17 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/70ec4ac4/components/camel-jms/src/main/docs/jms-component.adoc
--
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc 
b/components/camel-jms/src/main/docs/jms-component.adoc
index 7fd64d8..d15d6ff 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -203,84 +203,84 @@ The JMS component supports 75 options which are listed 
below.
 
 
 
-[width="100%",cols="2,1,1,6",options="header"]
+[width="100%",cols="2,1,6,1",options="header"]
 |===
-| Name | Default | Java Type | Description
-| **configuration** (advanced) |  | JmsConfiguration | To use a shared JMS 
configuration
-| **acceptMessagesWhileStopping** (consumer) | false | boolean | Specifies 
whether the consumer accept messages while it is stopping. You may consider 
enabling this option if you start and stop JMS routes at runtime while there 
are still messages enqueued on the queue. If this option is false and you stop 
the JMS route then messages may be rejected and the JMS broker would have to 
attempt redeliveries which yet again may be rejected and eventually the message 
may be moved at a dead letter queue on the JMS broker. To avoid this its 
recommended to enable this option.
-| **allowReplyManagerQuickStop** (consumer) | false | boolean | Whether the 
DefaultMessageListenerContainer used in the reply managers for request-reply 
messaging allow the DefaultMessageListenerContainer.runningAllowed flag to 
quick stop in case JmsConfigurationisAcceptMessagesWhileStopping is enabled and 
org.apache.camel.CamelContext is currently being stopped. This quick stop 
ability is enabled by default in the regular JMS consumers but to enable for 
reply managers you must enable this flag.
-| **acknowledgementMode** (consumer) |  | int | The JMS acknowledgement mode 
defined as an Integer. Allows you to set vendor-specific extensions to the 
acknowledgment mode. For the regular modes it is preferable to use the 
acknowledgementModeName instead.
-| **eagerLoadingOfProperties** (consumer) | false | boolean | Enables eager 
loading of JMS properties as soon as a message is loaded which generally is 
inefficient as the JMS properties may not be required but sometimes can catch 
early any issues with the underlying JMS provider and the use of JMS properties
-| **acknowledgementModeName** (consumer) | AUTO_ ACKNOWLEDGE | String | The 
JMS acknowledgement name which is one of: SESSION_TRANSACTED CLIENT_ACKNOWLEDGE 
AUTO_ACKNOWLEDGE DUPS_OK_ACKNOWLEDGE
-| **autoStartup** (consumer) | true | boolean | Specifies whether the consumer 
container should auto-startup.
-| **cacheLevel** (consumer) |  | int | Sets the cache level by ID for the 
underlying JMS resources. See cacheLevelName option for more details.
-| **cacheLevelName** (consumer) | CACHE_AUTO | String | Sets the cache level 
by name for the underlying JMS resources. Possible values are: CACHE_AUTO 
CACHE_CONNECTION CACHE_CONSUMER CACHE_NONE and CACHE_SESSION. The default 
setting is CACHE_AUTO. See the Spring documentation and Transactions Cache 
Levels for more information.
-| **replyToCacheLevelName** (producer) |  | String | Sets the cache level by 
name for the reply consumer when doing request/reply over JMS. This option only 
applies when using fixed reply queues (not temporary). Camel will by default 
use: CACHE_CONSUMER for exclusive or shared w/ replyToSelectorName. And 
CACHE_SESSION for shared without replyToSelectorName. Some JMS brokers such as 
IBM WebSphere may require to set the replyToCacheLevelName=CACHE_NONE to work. 
Note: If using temporary queues then CACHE_NONE is not allowed and you must use 
a higher value such as CACHE_CONSUMER or CACHE_SESSION.
-| **clientId** (common) |  | String | Sets the JMS client ID to use. Note that 
this value if specified must be unique and can only be used by a single JMS 
connection instance. It is typically only required for durable topic 
subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics 
instead.
-| **concurrentConsumers** (consumer) | 1 | int | Specifies the default number 
of concurrent consumers when consuming from JMS (not for request/reply over 
JMS). See also the maxMessagesPerTask option to control dynamic scaling up/down 
of threads. When doing request/reply over JMS then the option 
replyToConcurrentConsumers is used to control number of concurrent consumers on 
the reply message listener.
-| **replyToConcurrentConsumers** (producer) | 1 | int | Specifies the default 
number of concurrent consumers when doing request/reply over JMS. See also the 
maxMessagesPerTask option to control dynamic scaling up/down of threads.
-| **connectionFactory** (common) |  | ConnectionFactory | The connection 
factory to be use. A connection factory must be

[1/3] camel git commit: Component docs - Adjust tables as the previous attempt did not look so good.

2017-03-17 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 03d2a09c9 -> 70ec4ac4f


http://git-wip-us.apache.org/repos/asf/camel/blob/70ec4ac4/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
index 8220e10..4efc7dd 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
@@ -5,9 +5,9 @@ The @{title} component supports @{componentOptions.size()} 
options which are lis
 @end{}
 
 @if{!componentOptions.isEmpty()}
-[width="100%",cols="2,1,1,6",options="header"]
+[width="100%",cols="2,1,6,1",options="header"]
 |===
-| Name | Default | Java Type | Description
-@foreach{row : componentOptions}| **@{row.getShortName(35)}** 
(@{row.shortGroup}) | @{row.getShortDefaultValue(25)} | 
@{row.getShortJavaType(25)} | @{row.description}
+| Name | Default | Description | Java Type
+@foreach{row : componentOptions}| **@{row.getShortName(35)}** 
(@{row.shortGroup}) | @{row.getShortDefaultValue(25)} | @{row.description} | 
@{row.getShortJavaType(25)}
 @end{}|===
 @end{}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/70ec4ac4/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
index 7617962..f49cbe4 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
@@ -6,16 +6,16 @@ with the following path and query parameters:
 
  Path Parameters (@{endpointPathOptions.size()} parameters):
 
-[width="100%",cols="2,1,1,6",options="header"]
+[width="100%",cols="2,1,6,1",options="header"]
 |===
 | Name | Default | Java Type | Description
-@foreach{row : endpointPathOptions}| **@{row.getShortName(35)}** | 
@{row.getShortDefaultValue(25)} | @{row.getShortJavaType(25)} | 
@{row.description}
+@foreach{row : endpointPathOptions}| **@{row.getShortName(35)}** | 
@{row.getShortDefaultValue(25)} | @{row.description} | 
@{row.getShortJavaType(25)}
 @end{}|===
 
  Query Parameters (@{endpointOptions.size()} parameters):
 
-[width="100%",cols="2,1,1,6",options="header"]
+[width="100%",cols="2,1,6,1",options="header"]
 |===
 | Name | Default | Java Type | Description
-@foreach{row : endpointOptions}| **@{row.getShortName(35)}** 
(@{row.shortGroup}) | @{row.getShortDefaultValue(25)} | 
@{row.getShortJavaType(25)} | @{row.description}
+@foreach{row : endpointOptions}| **@{row.getShortName(35)}** 
(@{row.shortGroup}) | @{row.getShortDefaultValue(25)} | @{row.description} | 
@{row.getShortJavaType(25)}
 @end{}|===

camel git commit: Component docs - Adjust tables as the previous attempt did not look so good.

2017-03-17 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master fc4b5678c -> 03d2a09c9


Component docs - Adjust tables as the previous attempt did not look so good.


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

Branch: refs/heads/master
Commit: 03d2a09c99139430bcab980dddf2293e6eb3352c
Parents: fc4b567
Author: Claus Ibsen 
Authored: Fri Mar 17 13:47:57 2017 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 17 13:47:57 2017 +0100

--
 components/camel-jms/src/main/docs/jms-component.adoc  | 4 ++--
 .../camel/maven/packaging/model/ComponentOptionModel.java  | 6 ++
 .../camel/maven/packaging/model/EndpointOptionModel.java   | 6 ++
 3 files changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/03d2a09c/components/camel-jms/src/main/docs/jms-component.adoc
--
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc 
b/components/camel-jms/src/main/docs/jms-component.adoc
index 0100588..7fd64d8 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -211,7 +211,7 @@ The JMS component supports 75 options which are listed 
below.
 | **allowReplyManagerQuickStop** (consumer) | false | boolean | Whether the 
DefaultMessageListenerContainer used in the reply managers for request-reply 
messaging allow the DefaultMessageListenerContainer.runningAllowed flag to 
quick stop in case JmsConfigurationisAcceptMessagesWhileStopping is enabled and 
org.apache.camel.CamelContext is currently being stopped. This quick stop 
ability is enabled by default in the regular JMS consumers but to enable for 
reply managers you must enable this flag.
 | **acknowledgementMode** (consumer) |  | int | The JMS acknowledgement mode 
defined as an Integer. Allows you to set vendor-specific extensions to the 
acknowledgment mode. For the regular modes it is preferable to use the 
acknowledgementModeName instead.
 | **eagerLoadingOfProperties** (consumer) | false | boolean | Enables eager 
loading of JMS properties as soon as a message is loaded which generally is 
inefficient as the JMS properties may not be required but sometimes can catch 
early any issues with the underlying JMS provider and the use of JMS properties
-| **acknowledgementModeName** (consumer) | AUTO_ACKNOWLEDGE | String | The JMS 
acknowledgement name which is one of: SESSION_TRANSACTED CLIENT_ACKNOWLEDGE 
AUTO_ACKNOWLEDGE DUPS_OK_ACKNOWLEDGE
+| **acknowledgementModeName** (consumer) | AUTO_ ACKNOWLEDGE | String | The 
JMS acknowledgement name which is one of: SESSION_TRANSACTED CLIENT_ACKNOWLEDGE 
AUTO_ACKNOWLEDGE DUPS_OK_ACKNOWLEDGE
 | **autoStartup** (consumer) | true | boolean | Specifies whether the consumer 
container should auto-startup.
 | **cacheLevel** (consumer) |  | int | Sets the cache level by ID for the 
underlying JMS resources. See cacheLevelName option for more details.
 | **cacheLevelName** (consumer) | CACHE_AUTO | String | Sets the cache level 
by name for the underlying JMS resources. Possible values are: CACHE_AUTO 
CACHE_CONNECTION CACHE_CONSUMER CACHE_NONE and CACHE_SESSION. The default 
setting is CACHE_AUTO. See the Spring documentation and Transactions Cache 
Levels for more information.
@@ -328,7 +328,7 @@ with the following path and query parameters:
 | **durableSubscriptionName** (common) |  | String | The durable subscriber 
name for specifying durable topic subscriptions. The clientId option must be 
configured as well.
 | **jmsMessageType** (common) |  | JmsMessageType | Allows you to force the 
use of a specific javax.jms.Message implementation for sending JMS messages. 
Possible values are: Bytes Map Object Stream Text. By default Camel would 
determine which JMS message type to use from the In body type. This option 
allows you to specify it.
 | **testConnectionOnStartup** (common) | false | boolean | Specifies whether 
to test the connection on startup. This ensures that when Camel starts that all 
the JMS consumers have a valid connection to the JMS broker. If a connection 
cannot be granted then Camel throws an exception on startup. This ensures that 
Camel is not started with failed connections. The JMS producers is tested as 
well.
-| **acknowledgementModeName** (consumer) | AUTO_ACKNOWLEDGE | String | The JMS 
acknowledgement name which is one of: SESSION_TRANSACTED CLIENT_ACKNOWLEDGE 
AUTO_ACKNOWLEDGE DUPS_OK_ACKNOWLEDGE
+| **acknowledgementModeName** (consumer) | AUTO_ ACKNOWLEDGE | String | The 
JMS acknowledgement name which is one

camel git commit: Component docs - Adjust tables as the previous attempt did not look so good.

2017-03-17 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 572a09eb7 -> fc4b5678c


Component docs - Adjust tables as the previous attempt did not look so good.


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

Branch: refs/heads/master
Commit: fc4b5678c298d266b7fab8397361078009c0023e
Parents: 572a09e
Author: Claus Ibsen 
Authored: Fri Mar 17 13:41:53 2017 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 17 13:42:18 2017 +0100

--
 .../camel-jms/src/main/docs/jms-component.adoc  | 166 +--
 .../camel/maven/packaging/StringHelper.java |  15 +-
 .../packaging/model/ComponentOptionModel.java   |  28 +++-
 .../packaging/model/EndpointOptionModel.java|  26 ++-
 .../src/main/resources/component-options.mvel   |   2 +-
 .../src/main/resources/endpoint-options.mvel|   4 +-
 6 files changed, 141 insertions(+), 100 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fc4b5678/components/camel-jms/src/main/docs/jms-component.adoc
--
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc 
b/components/camel-jms/src/main/docs/jms-component.adoc
index 901e76e..0100588 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -207,12 +207,12 @@ The JMS component supports 75 options which are listed 
below.
 |===
 | Name | Default | Java Type | Description
 | **configuration** (advanced) |  | JmsConfiguration | To use a shared JMS 
configuration
-| **acceptMessagesWhileStopping** (consumer) | False | boolean | Specifies 
whether the consumer accept messages while it is stopping. You may consider 
enabling this option if you start and stop JMS routes at runtime while there 
are still messages enqueued on the queue. If this option is false and you stop 
the JMS route then messages may be rejected and the JMS broker would have to 
attempt redeliveries which yet again may be rejected and eventually the message 
may be moved at a dead letter queue on the JMS broker. To avoid this its 
recommended to enable this option.
-| **allowReplyManagerQuickStop** (consumer) | False | boolean | Whether the 
DefaultMessageListenerContainer used in the reply managers for request-reply 
messaging allow the DefaultMessageListenerContainer.runningAllowed flag to 
quick stop in case JmsConfigurationisAcceptMessagesWhileStopping is enabled and 
org.apache.camel.CamelContext is currently being stopped. This quick stop 
ability is enabled by default in the regular JMS consumers but to enable for 
reply managers you must enable this flag.
+| **acceptMessagesWhileStopping** (consumer) | false | boolean | Specifies 
whether the consumer accept messages while it is stopping. You may consider 
enabling this option if you start and stop JMS routes at runtime while there 
are still messages enqueued on the queue. If this option is false and you stop 
the JMS route then messages may be rejected and the JMS broker would have to 
attempt redeliveries which yet again may be rejected and eventually the message 
may be moved at a dead letter queue on the JMS broker. To avoid this its 
recommended to enable this option.
+| **allowReplyManagerQuickStop** (consumer) | false | boolean | Whether the 
DefaultMessageListenerContainer used in the reply managers for request-reply 
messaging allow the DefaultMessageListenerContainer.runningAllowed flag to 
quick stop in case JmsConfigurationisAcceptMessagesWhileStopping is enabled and 
org.apache.camel.CamelContext is currently being stopped. This quick stop 
ability is enabled by default in the regular JMS consumers but to enable for 
reply managers you must enable this flag.
 | **acknowledgementMode** (consumer) |  | int | The JMS acknowledgement mode 
defined as an Integer. Allows you to set vendor-specific extensions to the 
acknowledgment mode. For the regular modes it is preferable to use the 
acknowledgementModeName instead.
-| **eagerLoadingOfProperties** (consumer) | False | boolean | Enables eager 
loading of JMS properties as soon as a message is loaded which generally is 
inefficient as the JMS properties may not be required but sometimes can catch 
early any issues with the underlying JMS provider and the use of JMS properties
+| **eagerLoadingOfProperties** (consumer) | false | boolean | Enables eager 
loading of JMS properties as soon as a message is loaded which generally is 
inefficient as the JMS properties may not be required but sometimes can catch 
early any

[4/4] camel git commit: Component docs - Adjust tables as the previous attempt did not look so good.

2017-03-17 Thread davsclaus 
Component docs - Adjust tables as the previous attempt did not look so good.


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

Branch: refs/heads/master
Commit: 1f50c7291f73a0738b8f5e13481cd550ed639f57
Parents: 0b074a7
Author: Claus Ibsen 
Authored: Fri Mar 17 12:10:22 2017 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 17 13:16:54 2017 +0100

--
 .../tools/apt/EndpointAnnotationProcessor.java  |  3 +-
 .../maven/camel-package-maven-plugin/pom.xml|  7 ++
 .../camel/maven/packaging/StringHelper.java | 74 
 .../packaging/model/ComponentOptionModel.java   | 28 
 .../packaging/model/EndpointOptionModel.java| 26 +++
 .../src/main/resources/component-options.mvel   |  3 +-
 .../src/main/resources/endpoint-options.mvel|  5 +-
 7 files changed, 140 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1f50c729/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index 561dce8..3c7a381 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -452,7 +452,8 @@ public class EndpointAnnotationProcessor extends 
AbstractProcessor {
 }
 
 // skip unwanted methods as they are inherited from default 
component and are not intended for end users to configure
-if ("setEndpointClass".equals(methodName) || 
"setCamelContext".equals(methodName) || 
"setEndpointHeaderFilterStrategy".equals(methodName)) {
+if ("setEndpointClass".equals(methodName) || 
"setCamelContext".equals(methodName)
+|| "setEndpointHeaderFilterStrategy".equals(methodName) || 
"setApplicationContext".equals(methodName)) {
 continue;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/1f50c729/tooling/maven/camel-package-maven-plugin/pom.xml
--
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml 
b/tooling/maven/camel-package-maven-plugin/pom.xml
index c702518..24bbc02 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -105,6 +105,13 @@
   ${asciidoctorj-version}
 
 
+
+
+  com.google.guava
+  guava
+  ${google-guava-version}
+
+
 
 
   org.jboss.forge.roaster

http://git-wip-us.apache.org/repos/asf/camel/blob/1f50c729/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
index d7829ae..2f0dfcd 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
@@ -18,6 +18,8 @@ package org.apache.camel.maven.packaging;
 
 import java.util.Collection;
 
+import com.google.common.base.CaseFormat;
+
 public final class StringHelper {
 
 private StringHelper() {
@@ -97,4 +99,76 @@ public final class StringHelper {
 return answer;
 }
 
+/**
+ * To wrap long camel cased texts by words.
+ *
+ * @param option  the option which is camel cased.
+ * @param watermark a watermark to denote the size to cut after
+ * @param newLine the new line to use when breaking into a new line
+ */
+public static String wrapCamelCaseWords(String option, int watermark, 
String newLine) {
+String text = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, 
option);
+text = text.replace('-', ' ');
+text = wrapWords(text, "\n", watermark, false);
+text = text.replace(' ', '-');
+text = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, text);
+text = text.replaceAll("\\n", newLine);
+return text;
+}
+
+/**
+ * To wrap a big line by words.
+ *
+ * @param line the big

[3/4] camel git commit: Component docs - Adjust tables as the previous attempt did not look so good.

2017-03-17 Thread davsclaus 
Component docs - Adjust tables as the previous attempt did not look so good.


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

Branch: refs/heads/master
Commit: 2f9773e24e6ccb9f4127e44ac3bf742bbf8317ed
Parents: 1f50c72
Author: Claus Ibsen 
Authored: Fri Mar 17 13:16:40 2017 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 17 13:16:54 2017 +0100

--
 .../camel-jms/src/main/docs/jms-component.adoc  | 494 +++
 .../springboot/JmsComponentConfiguration.java   |  13 -
 .../src/main/resources/component-options.mvel   |   2 +-
 .../src/main/resources/endpoint-options.mvel|   4 +-
 4 files changed, 169 insertions(+), 344 deletions(-)
--

[2/4] camel git commit: Component docs - Adjust tables as the previous attempt did not look so good.

2017-03-17 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/2f9773e2/components/camel-jms/src/main/docs/jms-component.adoc
--
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc 
b/components/camel-jms/src/main/docs/jms-component.adoc
index f7a9893..901e76e 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -199,165 +199,88 @@ about these properties by consulting the relevant Spring 
documentation.
 
 
 // component options: START
-The JMS component supports 76 options which are listed below.
+The JMS component supports 75 options which are listed below.
 
 
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,1,1,6",options="header"]
 |===
 | Name | Default | Java Type | Description
- 4+^s| advanced
-| configuration |  | JmsConfiguration | To use a shared JMS configuration
- 4+^s| consumer (advanced)
-| acceptMessagesWhileStopping | false | boolean | Specifies whether the 
consumer accept messages while it is stopping. You may consider enabling this 
option if you start and stop JMS routes at runtime while there are still 
messages enqueued on the queue. If this option is false and you stop the JMS 
route then messages may be rejected and the JMS broker would have to attempt 
redeliveries which yet again may be rejected and eventually the message may be 
moved at a dead letter queue on the JMS broker. To avoid this its recommended 
to enable this option.
-
-| allowReplyManagerQuickStop | false | boolean | Whether the 
DefaultMessageListenerContainer used in the reply managers for request-reply 
messaging allow the DefaultMessageListenerContainer.runningAllowed flag to 
quick stop in case JmsConfigurationisAcceptMessagesWhileStopping is enabled and 
org.apache.camel.CamelContext is currently being stopped. This quick stop 
ability is enabled by default in the regular JMS consumers but to enable for 
reply managers you must enable this flag.
- 4+^s| consumer
-| acknowledgementMode |  | int | The JMS acknowledgement mode defined as an 
Integer. Allows you to set vendor-specific extensions to the acknowledgment 
mode. For the regular modes it is preferable to use the acknowledgementModeName 
instead.
- 4+^s| consumer (advanced)
-| eagerLoadingOfProperties | false | boolean | Enables eager loading of JMS 
properties as soon as a message is loaded which generally is inefficient as the 
JMS properties may not be required but sometimes can catch early any issues 
with the underlying JMS provider and the use of JMS properties
- 4+^s| consumer
-| acknowledgementModeName | AUTO_ACKNOWLEDGE | String | The JMS 
acknowledgement name which is one of: SESSION_TRANSACTED CLIENT_ACKNOWLEDGE 
AUTO_ACKNOWLEDGE DUPS_OK_ACKNOWLEDGE
-
-| autoStartup | true | boolean | Specifies whether the consumer container 
should auto-startup.
-
-| cacheLevel |  | int | Sets the cache level by ID for the underlying JMS 
resources. See cacheLevelName option for more details.
-
-| cacheLevelName | CACHE_AUTO | String | Sets the cache level by name for the 
underlying JMS resources. Possible values are: CACHE_AUTO CACHE_CONNECTION 
CACHE_CONSUMER CACHE_NONE and CACHE_SESSION. The default setting is CACHE_AUTO. 
See the Spring documentation and Transactions Cache Levels for more information.
- 4+^s| producer (advanced)
-| replyToCacheLevelName |  | String | Sets the cache level by name for the 
reply consumer when doing request/reply over JMS. This option only applies when 
using fixed reply queues (not temporary). Camel will by default use: 
CACHE_CONSUMER for exclusive or shared w/ replyToSelectorName. And 
CACHE_SESSION for shared without replyToSelectorName. Some JMS brokers such as 
IBM WebSphere may require to set the replyToCacheLevelName=CACHE_NONE to work. 
Note: If using temporary queues then CACHE_NONE is not allowed and you must use 
a higher value such as CACHE_CONSUMER or CACHE_SESSION.
- 4+^s| common
-| clientId |  | String | Sets the JMS client ID to use. Note that this value 
if specified must be unique and can only be used by a single JMS connection 
instance. It is typically only required for durable topic subscriptions. If 
using Apache ActiveMQ you may prefer to use Virtual Topics instead.
- 4+^s| consumer
-| concurrentConsumers | 1 | int | Specifies the default number of concurrent 
consumers when consuming from JMS (not for request/reply over JMS). See also 
the maxMessagesPerTask option to control dynamic scaling up/down of threads. 
When doing request/reply over JMS then the option replyToConcurrentConsumers is 
used to control number of concurrent consumers on the reply message listener.
- 4+^s| producer
-| replyToConcurrentConsumers | 1 | int | Specifies the default number of 
concurrent consumers when doing request/reply over JMS. See also the 
maxMessagesPerTask option to