Repository: camel Updated Branches: refs/heads/master 07e9ada54 -> 23931fe93
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/23931fe9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/23931fe9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/23931fe9 Branch: refs/heads/master Commit: 23931fe93b74be0de8c9fab9dd98d43d0b5832a8 Parents: 07e9ada Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Sep 3 09:58:17 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Sep 3 09:58:17 2017 +0200 ---------------------------------------------------------------------- .../camel-amqp/src/main/docs/amqp-component.adoc | 6 ++++-- .../amqp/springboot/AMQPComponentConfiguration.java | 16 ++++++++++++++++ .../components-starter/camel-core-starter/pom.xml | 5 ----- 3 files changed, 20 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/23931fe9/components/camel-amqp/src/main/docs/amqp-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc b/components/camel-amqp/src/main/docs/amqp-component.adoc index 650ee87..c458977 100644 --- a/components/camel-amqp/src/main/docs/amqp-component.adoc +++ b/components/camel-amqp/src/main/docs/amqp-component.adoc @@ -38,7 +38,7 @@ link:../../../../camel-jms/src/main/docs/readme.html[JMS] component after the de // component options: START -The AMQP component supports 75 options which are listed below. +The AMQP component supports 76 options which are listed below. @@ -113,6 +113,7 @@ The AMQP component supports 75 options which are listed below. | **includeAllJMSX Properties** (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 | **defaultTaskExecutor Type** (consumer) | Specifies what default TaskExecutor type to use in the DefaultMessageListenerContainer for both consumer endpoints and the ReplyTo consumer of producer endpoints. Possible values: SimpleAsync (uses Spring's SimpleAsyncTaskExecutor) or ThreadPool (uses Spring's ThreadPoolTaskExecutor with optimal values - cached threadpool-like). If not set it defaults to the previous behaviour which uses a cached thread pool for consumer endpoints and SimpleAsync for reply consumers. The use of ThreadPool is recommended to reduce thread trash in elastic configurations with dynamically increasing and decreasing concurrent consumers. | | DefaultTaskExecutor Type | **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 +| **allowAdditionalHeaders** (producer) | This option is used to allow additional headers which may have values that are invalid according to JMS specification. For example some message systems such as WMQ do this vith headers JMS_IBM_MQMD_ that contains byte or other invalid types. You can specify multiple header names separated by comma and use as suffix for wildcard matching. | | String | **queueBrowseStrategy** (advanced) | To use a custom QueueBrowseStrategy when browsing queues | | QueueBrowseStrategy | **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 | **waitForProvision CorrelationToBeUpdated Counter** (advanced) | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | int @@ -145,7 +146,7 @@ with the following path and query parameters: | **destinationName** | *Required* Name of the queue or topic to use as destination | | String |======================================================================= -#### Query Parameters (85 parameters): +#### Query Parameters (86 parameters): [width="100%",cols="2,5,^1,2",options="header"] |======================================================================= @@ -189,6 +190,7 @@ with the following path and query parameters: | **replyToType** (producer) | Allows for explicitly specifying which kind of strategy to use for replyTo queues when doing request/reply over JMS. Possible values are: Temporary Shared or Exclusive. By default Camel will use temporary queues. However if replyTo has been configured then Shared is used by default. This option allows you to use exclusive queues instead of shared ones. See Camel JMS documentation for more details and especially the notes about the implications if running in a clustered environment and the fact that Shared reply queues has lower performance than its alternatives Temporary and Exclusive. | | ReplyToType | **requestTimeout** (producer) | The timeout for waiting for a reply when using the InOut Exchange Pattern (in milliseconds). The default is 20 seconds. You can include the header CamelJmsRequestTimeout to override this endpoint configured timeout value and thus have per message individual timeout values. See also the requestTimeoutCheckerInterval option. | 20000 | long | **timeToLive** (producer) | When sending messages specifies the time-to-live of the message (in milliseconds). | -1 | long +| **allowAdditionalHeaders** (producer) | This option is used to allow additional headers which may have values that are invalid according to JMS specification. For example some message systems such as WMQ do this vith headers JMS_IBM_MQMD_ that contains byte or other invalid types. You can specify multiple header names separated by comma and use as suffix for wildcard matching. | | String | **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 | **alwaysCopyMessage** (producer) | 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 replyToDestinationSelectorName is set) | false | boolean | **correlationProperty** (producer) | When using InOut exchange pattern use this JMS property instead of JMSCorrelationID JMS property to correlate messages. If set messages will be correlated solely on the value of this property JMSCorrelationID property will be ignored and not set by Camel. | | String http://git-wip-us.apache.org/repos/asf/camel/blob/23931fe9/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java index ebe4f8f..33402b3 100644 --- a/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java @@ -531,6 +531,14 @@ public class AMQPComponentConfiguration @NestedConfigurationProperty private JmsKeyFormatStrategy jmsKeyFormatStrategy; /** + * This option is used to allow additional headers which may have values + * that are invalid according to JMS specification. For example some message + * systems such as WMQ do this vith headers JMS_IBM_MQMD_ that contains byte + * or other invalid types. You can specify multiple header names separated + * by comma and use as suffix for wildcard matching. + */ + private String allowAdditionalHeaders; + /** * To use a custom QueueBrowseStrategy when browsing queues */ @NestedConfigurationProperty @@ -1132,6 +1140,14 @@ public class AMQPComponentConfiguration this.jmsKeyFormatStrategy = jmsKeyFormatStrategy; } + public String getAllowAdditionalHeaders() { + return allowAdditionalHeaders; + } + + public void setAllowAdditionalHeaders(String allowAdditionalHeaders) { + this.allowAdditionalHeaders = allowAdditionalHeaders; + } + public QueueBrowseStrategy getQueueBrowseStrategy() { return queueBrowseStrategy; } http://git-wip-us.apache.org/repos/asf/camel/blob/23931fe9/platforms/spring-boot/components-starter/camel-core-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-core-starter/pom.xml b/platforms/spring-boot/components-starter/camel-core-starter/pom.xml index 51bd1ae..7615942 100644 --- a/platforms/spring-boot/components-starter/camel-core-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-core-starter/pom.xml @@ -39,10 +39,5 @@ <artifactId>camel-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </project>
