Quantcast

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

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

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

davsclaus-2
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 <[hidden email]>
Authored: Fri Mar 17 13:47:57 2017 +0100
Committer: Claus Ibsen <[hidden email]>
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 of: SESSION_TRANSACTED CLIENT_ACKNOWLEDGE AUTO_ACKNOWLEDGE DUPS_OK_ACKNOWLEDGE
 | **asyncConsumer** (consumer) | false | boolean | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100 strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transacted has been enabled then asyncConsumer=true does not run asynchronously as transaction must be executed synchronously (Camel 3.0 may support async transactions).
 | **autoStartup** (consumer) | true | boolean | Specifies whether the consumer container should auto-startup.
 | **bridgeErrorHandler** (consumer) | false | boolean | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN or ERROR level and ignored.

http://git-wip-us.apache.org/repos/asf/camel/blob/03d2a09c/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java
index 37b2943..3b1a21c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java
@@ -189,6 +189,12 @@ public class ComponentOptionModel {
         } else if (text.endsWith("<T>>")) {
             text = text.substring(0, text.length() - 4);
         }
+
+        // TODO: dirty hack for AUTO_ACKNOWLEDGE which we should wrap
+        if ("AUTO_ACKNOWLEDGE".equals(text)) {
+            return "AUTO_ ACKNOWLEDGE";
+        }
+
         return text;
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/03d2a09c/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EndpointOptionModel.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EndpointOptionModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EndpointOptionModel.java
index bd6090a..ad6103b 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EndpointOptionModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EndpointOptionModel.java
@@ -212,6 +212,12 @@ public class EndpointOptionModel {
         } else if (text.endsWith("<T>>")) {
             text = text.substring(0, text.length() - 4);
         }
+
+        // TODO: dirty hack for AUTO_ACKNOWLEDGE which we should wrap
+        if ("AUTO_ACKNOWLEDGE".equals(text)) {
+            return "AUTO_ ACKNOWLEDGE";
+        }
+
         return text;
     }
 

Loading...