You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/12/03 15:01:06 UTC
[camel] branch camel-3.0.x updated (ffb38d3 -> f05914d)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from ffb38d3 CAMEL-14220: camel-activemq - Setting brokerURL via camel-main issue
new a28ed8d spring boot groupId fix
new f81e7d2 Fixed flaky test on slow CI servers
new d7ed794 Upgrade CXF plugins
new 8caee32 Regen
new fb2162f Fixed CS
new 264d337 Regen
new 1e56b3a Upgrade Kubernetes client to version 4.6.4
new 7e15463 Upgrade Jandex to version 2.1.2.Final
new 18ae9ad Upgrade Brave Zipkin to version 5.9.1
new 5f7c8e2 Upgrade Xchange to version 4.4.1
new f05914d CAMEL-14219: enforce type conversion on reactive-streams subscriber (#3362)
The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/docs/activemq-component.adoc | 8 ++++--
.../camel-amqp/src/main/docs/amqp-component.adoc | 8 ++++--
.../camel-jms/src/main/docs/jms-component.adoc | 4 ++-
.../apache/camel/component/jms/JmsComponent.java | 1 +
.../engine/DefaultCamelReactiveStreamsService.java | 4 +--
.../streams/util/ConvertingSubscriber.java | 8 ++++--
.../reactor/engine/ReactorStreamsService.java | 4 +--
.../rxjava/engine/RxJavaStreamsService.java | 4 +--
.../ConsumerTemplateMaximumCacheSizeTest.java | 6 ++--
.../modules/ROOT/pages/activemq-component.adoc | 8 ++++--
.../modules/ROOT/pages/amqp-component.adoc | 8 ++++--
.../modules/ROOT/pages/jms-component.adoc | 4 ++-
parent/pom.xml | 16 +++++------
.../springboot/ActiveMQComponentConfiguration.java | 32 ++++++++++++++++++++++
.../springboot/AMQPComponentConfiguration.java | 32 ++++++++++++++++++++++
platforms/spring-boot/spring-boot-dm/README.adoc | 2 +-
.../camel/itest/springboot/util/BOMResolver.java | 8 +++---
17 files changed, 123 insertions(+), 34 deletions(-)
[camel] 02/11: Fixed flaky test on slow CI servers
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f81e7d2705a080bab4490ba60186c1bb58a6a79b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Nov 25 09:39:03 2019 +0100
Fixed flaky test on slow CI servers
---
.../camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java
index a16d812..55d7fbc 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java
@@ -43,8 +43,8 @@ public class ConsumerTemplateMaximumCacheSizeTest extends SpringRunWithTestSuppo
assertEquals(50, template.getMaximumCacheSize());
assertEquals("Size should be 0", 0, template.getCurrentCacheSize());
- // test that we cache at most 50 producers to avoid it eating too much memory
- for (int i = 0; i < 53; i++) {
+ // test that we cache around 50 producers to avoid it eating too much memory
+ for (int i = 0; i <= 55; i++) {
Endpoint e = context.getEndpoint("direct:queue:" + i);
template.receiveNoWait(e);
}
@@ -54,7 +54,7 @@ public class ConsumerTemplateMaximumCacheSizeTest extends SpringRunWithTestSuppo
// eviction may still run a bit
int currentCacheSize = template.getCurrentCacheSize();
- assertTrue("Size should be around 50, but was " + currentCacheSize, currentCacheSize <= 51);
+ assertTrue("Size should be around 50, but was " + currentCacheSize, currentCacheSize <= 53);
template.stop();
// should be 0
[camel] 09/11: Upgrade Brave Zipkin to version 5.9.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 18ae9ada4147c95f88dbe18970a34622312186d1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 26 13:57:14 2019 +0100
Upgrade Brave Zipkin to version 5.9.1
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index cf89855..ff894d6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -102,7 +102,7 @@
<bouncycastle-version>1.64</bouncycastle-version>
<box-java-sdk-version>2.41.0</box-java-sdk-version>
<braintree-gateway-version>2.106.0</braintree-gateway-version>
- <brave-zipkin-version>5.9.0</brave-zipkin-version>
+ <brave-zipkin-version>5.9.1</brave-zipkin-version>
<build-helper-maven-plugin-version>1.12</build-helper-maven-plugin-version>
<c3p0-version>0.9.5.4</c3p0-version>
<c3p0-bundle-version>0.9.5.4_1</c3p0-bundle-version>
[camel] 06/11: Regen
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 264d33786db2cfed05d25eaed7de3b07fd3010fa
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 26 09:52:18 2019 +0100
Regen
---
.../src/main/docs/activemq-component.adoc | 8 ++++--
.../camel-amqp/src/main/docs/amqp-component.adoc | 8 ++++--
.../modules/ROOT/pages/activemq-component.adoc | 8 ++++--
.../modules/ROOT/pages/amqp-component.adoc | 8 ++++--
.../springboot/ActiveMQComponentConfiguration.java | 32 ++++++++++++++++++++++
.../springboot/AMQPComponentConfiguration.java | 32 ++++++++++++++++++++++
6 files changed, 88 insertions(+), 8 deletions(-)
diff --git a/components/camel-activemq/src/main/docs/activemq-component.adoc b/components/camel-activemq/src/main/docs/activemq-component.adoc
index dc54465..143ed11 100644
--- a/components/camel-activemq/src/main/docs/activemq-component.adoc
+++ b/components/camel-activemq/src/main/docs/activemq-component.adoc
@@ -48,7 +48,7 @@ activemq:foo
== Component options
// component options: START
-The ActiveMQ component supports 86 options, which are listed below.
+The ActiveMQ component supports 88 options, which are listed below.
@@ -60,6 +60,8 @@ The ActiveMQ component supports 86 options, which are listed below.
| *usePooledConnection* (common) | Enables or disables whether a PooledConnectionFactory will be used so that when messages are sent to ActiveMQ from outside of a message consuming thread, pooling will be used rather than the default with the Spring JmsTemplate which will create a new connection, session, producer for each message then close them all down again. The default value is true. | false | boolean
| *useSingleConnection* (common) | Enables or disables whether a Spring SingleConnectionFactory will be used so that when messages are sent to ActiveMQ from outside of a message consuming thread, pooling will be used rather than the default with the Spring JmsTemplate which will create a new connection, session, producer for each message then close them all down again. The default value is false and a pooled connection is used by default. | false | boolean
| *configuration* (common) | Configuration of ActiveMQ | | JmsConfiguration
+| *allowAutoWired ConnectionFactory* (advanced) | Whether to auto-discover ConnectionFactory from the registry, if no connection factory has been configured. If only one instance of ConnectionFactory is found then it will be used. This is enabled by default. | false | boolean
+| *allowAutoWired DestinationResolver* (advanced) | Whether to auto-discover DestinationResolver from the registry, if no destination resolver has been configured. If only one instance of DestinationResolver is found then it will be used. This is enabled by default. | false | boolean
| *acceptMessagesWhile Stopping* (consumer) | 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 t [...]
| *allowReplyManagerQuick Stop* (consumer) | Whether the DefaultMessageListenerContainer used in the reply managers for request-reply messaging allow the DefaultMessageListenerContainer.runningAllowed flag to quick stop in case JmsConfiguration#isAcceptMessagesWhileStopping 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. | false [...]
| *acknowledgementMode* (consumer) | 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. | | int
@@ -285,7 +287,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 87 options, which are listed below.
+The component supports 89 options, which are listed below.
@@ -296,6 +298,8 @@ The component supports 87 options, which are listed below.
| *camel.component.activemq.acknowledgement-mode* | 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. | | Integer
| *camel.component.activemq.acknowledgement-mode-name* | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | String
| *camel.component.activemq.allow-additional-headers* | 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 with header names using prefix JMS_IBM_MQMD_ containing values with byte array or other invalid types. You can specify multiple header names separated by comma, and use as suffix for wildcard matching. | | String
+| *camel.component.activemq.allow-auto-wired-connection-factory* | Whether to auto-discover ConnectionFactory from the registry, if no connection factory has been configured. If only one instance of ConnectionFactory is found then it will be used. This is enabled by default. | false | Boolean
+| *camel.component.activemq.allow-auto-wired-destination-resolver* | Whether to auto-discover DestinationResolver from the registry, if no destination resolver has been configured. If only one instance of DestinationResolver is found then it will be used. This is enabled by default. | false | Boolean
| *camel.component.activemq.allow-null-body* | 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
| *camel.component.activemq.allow-reply-manager-quick-stop* | Whether the DefaultMessageListenerContainer used in the reply managers for request-reply messaging allow the DefaultMessageListenerContainer.runningAllowed flag to quick stop in case JmsConfiguration#isAcceptMessagesWhileStopping 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 th [...]
| *camel.component.activemq.always-copy-message* | 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
diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc b/components/camel-amqp/src/main/docs/amqp-component.adoc
index 43d0aac..3881f33 100644
--- a/components/camel-amqp/src/main/docs/amqp-component.adoc
+++ b/components/camel-amqp/src/main/docs/amqp-component.adoc
@@ -40,7 +40,7 @@ xref:jms-component.adoc[JMS] component after the destination name.
// component options: START
-The AMQP component supports 83 options, which are listed below.
+The AMQP component supports 85 options, which are listed below.
@@ -48,6 +48,8 @@ The AMQP component supports 83 options, which are listed below.
|===
| Name | Description | Default | Type
| *includeAmqpAnnotations* (common) | Whether to include AMQP annotations when mapping from AMQP to Camel Message. Setting this to true will map AMQP message annotations to message headers. Due to limitations in Apache Qpid JMS API, currently delivery annotations are ignored. | false | boolean
+| *allowAutoWired ConnectionFactory* (advanced) | Whether to auto-discover ConnectionFactory from the registry, if no connection factory has been configured. If only one instance of ConnectionFactory is found then it will be used. This is enabled by default. | false | boolean
+| *allowAutoWired DestinationResolver* (advanced) | Whether to auto-discover DestinationResolver from the registry, if no destination resolver has been configured. If only one instance of DestinationResolver is found then it will be used. This is enabled by default. | false | boolean
| *configuration* (advanced) | To use a shared JMS configuration | | JmsConfiguration
| *acceptMessagesWhile Stopping* (consumer) | 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 t [...]
| *allowReplyManagerQuick Stop* (consumer) | Whether the DefaultMessageListenerContainer used in the reply managers for request-reply messaging allow the DefaultMessageListenerContainer.runningAllowed flag to quick stop in case JmsConfiguration#isAcceptMessagesWhileStopping 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. | false [...]
@@ -276,7 +278,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 84 options, which are listed below.
+The component supports 86 options, which are listed below.
@@ -287,6 +289,8 @@ The component supports 84 options, which are listed below.
| *camel.component.amqp.acknowledgement-mode* | 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. | | Integer
| *camel.component.amqp.acknowledgement-mode-name* | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | String
| *camel.component.amqp.allow-additional-headers* | 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 with header names using prefix JMS_IBM_MQMD_ containing values with byte array or other invalid types. You can specify multiple header names separated by comma, and use as suffix for wildcard matching. | | String
+| *camel.component.amqp.allow-auto-wired-connection-factory* | Whether to auto-discover ConnectionFactory from the registry, if no connection factory has been configured. If only one instance of ConnectionFactory is found then it will be used. This is enabled by default. | false | Boolean
+| *camel.component.amqp.allow-auto-wired-destination-resolver* | Whether to auto-discover DestinationResolver from the registry, if no destination resolver has been configured. If only one instance of DestinationResolver is found then it will be used. This is enabled by default. | false | Boolean
| *camel.component.amqp.allow-null-body* | 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
| *camel.component.amqp.allow-reply-manager-quick-stop* | Whether the DefaultMessageListenerContainer used in the reply managers for request-reply messaging allow the DefaultMessageListenerContainer.runningAllowed flag to quick stop in case JmsConfiguration#isAcceptMessagesWhileStopping 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 f [...]
| *camel.component.amqp.always-copy-message* | 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
diff --git a/docs/components/modules/ROOT/pages/activemq-component.adoc b/docs/components/modules/ROOT/pages/activemq-component.adoc
index e7283bc83..5d0ee31 100644
--- a/docs/components/modules/ROOT/pages/activemq-component.adoc
+++ b/docs/components/modules/ROOT/pages/activemq-component.adoc
@@ -49,7 +49,7 @@ activemq:foo
== Component options
// component options: START
-The ActiveMQ component supports 86 options, which are listed below.
+The ActiveMQ component supports 88 options, which are listed below.
@@ -61,6 +61,8 @@ The ActiveMQ component supports 86 options, which are listed below.
| *usePooledConnection* (common) | Enables or disables whether a PooledConnectionFactory will be used so that when messages are sent to ActiveMQ from outside of a message consuming thread, pooling will be used rather than the default with the Spring JmsTemplate which will create a new connection, session, producer for each message then close them all down again. The default value is true. | false | boolean
| *useSingleConnection* (common) | Enables or disables whether a Spring SingleConnectionFactory will be used so that when messages are sent to ActiveMQ from outside of a message consuming thread, pooling will be used rather than the default with the Spring JmsTemplate which will create a new connection, session, producer for each message then close them all down again. The default value is false and a pooled connection is used by default. | false | boolean
| *configuration* (common) | Configuration of ActiveMQ | | JmsConfiguration
+| *allowAutoWired ConnectionFactory* (advanced) | Whether to auto-discover ConnectionFactory from the registry, if no connection factory has been configured. If only one instance of ConnectionFactory is found then it will be used. This is enabled by default. | false | boolean
+| *allowAutoWired DestinationResolver* (advanced) | Whether to auto-discover DestinationResolver from the registry, if no destination resolver has been configured. If only one instance of DestinationResolver is found then it will be used. This is enabled by default. | false | boolean
| *acceptMessagesWhile Stopping* (consumer) | 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 t [...]
| *allowReplyManagerQuick Stop* (consumer) | Whether the DefaultMessageListenerContainer used in the reply managers for request-reply messaging allow the DefaultMessageListenerContainer.runningAllowed flag to quick stop in case JmsConfiguration#isAcceptMessagesWhileStopping 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. | false [...]
| *acknowledgementMode* (consumer) | 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. | | int
@@ -286,7 +288,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 87 options, which are listed below.
+The component supports 89 options, which are listed below.
@@ -297,6 +299,8 @@ The component supports 87 options, which are listed below.
| *camel.component.activemq.acknowledgement-mode* | 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. | | Integer
| *camel.component.activemq.acknowledgement-mode-name* | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | String
| *camel.component.activemq.allow-additional-headers* | 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 with header names using prefix JMS_IBM_MQMD_ containing values with byte array or other invalid types. You can specify multiple header names separated by comma, and use as suffix for wildcard matching. | | String
+| *camel.component.activemq.allow-auto-wired-connection-factory* | Whether to auto-discover ConnectionFactory from the registry, if no connection factory has been configured. If only one instance of ConnectionFactory is found then it will be used. This is enabled by default. | false | Boolean
+| *camel.component.activemq.allow-auto-wired-destination-resolver* | Whether to auto-discover DestinationResolver from the registry, if no destination resolver has been configured. If only one instance of DestinationResolver is found then it will be used. This is enabled by default. | false | Boolean
| *camel.component.activemq.allow-null-body* | 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
| *camel.component.activemq.allow-reply-manager-quick-stop* | Whether the DefaultMessageListenerContainer used in the reply managers for request-reply messaging allow the DefaultMessageListenerContainer.runningAllowed flag to quick stop in case JmsConfiguration#isAcceptMessagesWhileStopping 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 th [...]
| *camel.component.activemq.always-copy-message* | 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
diff --git a/docs/components/modules/ROOT/pages/amqp-component.adoc b/docs/components/modules/ROOT/pages/amqp-component.adoc
index 62d4fc1..bfbbd9e 100644
--- a/docs/components/modules/ROOT/pages/amqp-component.adoc
+++ b/docs/components/modules/ROOT/pages/amqp-component.adoc
@@ -41,7 +41,7 @@ xref:jms-component.adoc[JMS] component after the destination name.
// component options: START
-The AMQP component supports 83 options, which are listed below.
+The AMQP component supports 85 options, which are listed below.
@@ -49,6 +49,8 @@ The AMQP component supports 83 options, which are listed below.
|===
| Name | Description | Default | Type
| *includeAmqpAnnotations* (common) | Whether to include AMQP annotations when mapping from AMQP to Camel Message. Setting this to true will map AMQP message annotations to message headers. Due to limitations in Apache Qpid JMS API, currently delivery annotations are ignored. | false | boolean
+| *allowAutoWired ConnectionFactory* (advanced) | Whether to auto-discover ConnectionFactory from the registry, if no connection factory has been configured. If only one instance of ConnectionFactory is found then it will be used. This is enabled by default. | false | boolean
+| *allowAutoWired DestinationResolver* (advanced) | Whether to auto-discover DestinationResolver from the registry, if no destination resolver has been configured. If only one instance of DestinationResolver is found then it will be used. This is enabled by default. | false | boolean
| *configuration* (advanced) | To use a shared JMS configuration | | JmsConfiguration
| *acceptMessagesWhile Stopping* (consumer) | 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 t [...]
| *allowReplyManagerQuick Stop* (consumer) | Whether the DefaultMessageListenerContainer used in the reply managers for request-reply messaging allow the DefaultMessageListenerContainer.runningAllowed flag to quick stop in case JmsConfiguration#isAcceptMessagesWhileStopping 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. | false [...]
@@ -277,7 +279,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 84 options, which are listed below.
+The component supports 86 options, which are listed below.
@@ -288,6 +290,8 @@ The component supports 84 options, which are listed below.
| *camel.component.amqp.acknowledgement-mode* | 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. | | Integer
| *camel.component.amqp.acknowledgement-mode-name* | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | String
| *camel.component.amqp.allow-additional-headers* | 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 with header names using prefix JMS_IBM_MQMD_ containing values with byte array or other invalid types. You can specify multiple header names separated by comma, and use as suffix for wildcard matching. | | String
+| *camel.component.amqp.allow-auto-wired-connection-factory* | Whether to auto-discover ConnectionFactory from the registry, if no connection factory has been configured. If only one instance of ConnectionFactory is found then it will be used. This is enabled by default. | false | Boolean
+| *camel.component.amqp.allow-auto-wired-destination-resolver* | Whether to auto-discover DestinationResolver from the registry, if no destination resolver has been configured. If only one instance of DestinationResolver is found then it will be used. This is enabled by default. | false | Boolean
| *camel.component.amqp.allow-null-body* | 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
| *camel.component.amqp.allow-reply-manager-quick-stop* | Whether the DefaultMessageListenerContainer used in the reply managers for request-reply messaging allow the DefaultMessageListenerContainer.runningAllowed flag to quick stop in case JmsConfiguration#isAcceptMessagesWhileStopping 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 f [...]
| *camel.component.amqp.always-copy-message* | 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
diff --git a/platforms/spring-boot/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
index fb91826..c5e6ef5 100644
--- a/platforms/spring-boot/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
@@ -76,6 +76,20 @@ public class ActiveMQComponentConfiguration
*/
private String configuration;
/**
+ * Whether to auto-discover ConnectionFactory from the registry, if no
+ * connection factory has been configured. If only one instance of
+ * ConnectionFactory is found then it will be used. This is enabled by
+ * default.
+ */
+ private Boolean allowAutoWiredConnectionFactory = false;
+ /**
+ * Whether to auto-discover DestinationResolver from the registry, if no
+ * destination resolver has been configured. If only one instance of
+ * DestinationResolver is found then it will be used. This is enabled by
+ * default.
+ */
+ private Boolean allowAutoWiredDestinationResolver = false;
+ /**
* 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
@@ -708,6 +722,24 @@ public class ActiveMQComponentConfiguration
this.configuration = configuration;
}
+ public Boolean getAllowAutoWiredConnectionFactory() {
+ return allowAutoWiredConnectionFactory;
+ }
+
+ public void setAllowAutoWiredConnectionFactory(
+ Boolean allowAutoWiredConnectionFactory) {
+ this.allowAutoWiredConnectionFactory = allowAutoWiredConnectionFactory;
+ }
+
+ public Boolean getAllowAutoWiredDestinationResolver() {
+ return allowAutoWiredDestinationResolver;
+ }
+
+ public void setAllowAutoWiredDestinationResolver(
+ Boolean allowAutoWiredDestinationResolver) {
+ this.allowAutoWiredDestinationResolver = allowAutoWiredDestinationResolver;
+ }
+
public Boolean getAcceptMessagesWhileStopping() {
return acceptMessagesWhileStopping;
}
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 7efaab6..6296b25 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
@@ -48,6 +48,20 @@ public class AMQPComponentConfiguration
*/
private Boolean includeAmqpAnnotations = false;
/**
+ * Whether to auto-discover ConnectionFactory from the registry, if no
+ * connection factory has been configured. If only one instance of
+ * ConnectionFactory is found then it will be used. This is enabled by
+ * default.
+ */
+ private Boolean allowAutoWiredConnectionFactory = false;
+ /**
+ * Whether to auto-discover DestinationResolver from the registry, if no
+ * destination resolver has been configured. If only one instance of
+ * DestinationResolver is found then it will be used. This is enabled by
+ * default.
+ */
+ private Boolean allowAutoWiredDestinationResolver = false;
+ /**
* To use a shared JMS configuration. The option is a
* org.apache.camel.component.jms.JmsConfiguration type.
*/
@@ -653,6 +667,24 @@ public class AMQPComponentConfiguration
this.includeAmqpAnnotations = includeAmqpAnnotations;
}
+ public Boolean getAllowAutoWiredConnectionFactory() {
+ return allowAutoWiredConnectionFactory;
+ }
+
+ public void setAllowAutoWiredConnectionFactory(
+ Boolean allowAutoWiredConnectionFactory) {
+ this.allowAutoWiredConnectionFactory = allowAutoWiredConnectionFactory;
+ }
+
+ public Boolean getAllowAutoWiredDestinationResolver() {
+ return allowAutoWiredDestinationResolver;
+ }
+
+ public void setAllowAutoWiredDestinationResolver(
+ Boolean allowAutoWiredDestinationResolver) {
+ this.allowAutoWiredDestinationResolver = allowAutoWiredDestinationResolver;
+ }
+
public String getConfiguration() {
return configuration;
}
[camel] 07/11: Upgrade Kubernetes client to version 4.6.4
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1e56b3ae9c70b37bf2cbcfda44d5763893cedcd7
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 26 10:29:57 2019 +0100
Upgrade Kubernetes client to version 4.6.4
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d5f4ae0..bfb8062 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -403,8 +403,8 @@
<kafka-bundle-version>2.3.1_1</kafka-bundle-version>
<karaf4-version>4.2.7</karaf4-version>
<kie-version>7.29.0.Final</kie-version>
- <kubernetes-client-version>4.6.3</kubernetes-client-version>
- <kubernetes-model-version>4.6.3</kubernetes-model-version>
+ <kubernetes-client-version>4.6.4</kubernetes-client-version>
+ <kubernetes-model-version>4.6.4</kubernetes-model-version>
<kudu-version>1.10.0</kudu-version>
<kxml2-bundle-version>2.3.0_3</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
[camel] 11/11: CAMEL-14219: enforce type conversion on
reactive-streams subscriber (#3362)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f05914da2c2ee99eb0929c32c786093e0db87558
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Wed Nov 27 05:01:02 2019 +0100
CAMEL-14219: enforce type conversion on reactive-streams subscriber (#3362)
---
.../streams/engine/DefaultCamelReactiveStreamsService.java | 4 ++--
.../component/reactive/streams/util/ConvertingSubscriber.java | 8 ++++++--
.../camel/component/reactor/engine/ReactorStreamsService.java | 4 ++--
.../camel/component/rxjava/engine/RxJavaStreamsService.java | 4 ++--
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/DefaultCamelReactiveStreamsService.java b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/DefaultCamelReactiveStreamsService.java
index 96ca0ed..19d50a6 100644
--- a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/DefaultCamelReactiveStreamsService.java
+++ b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/DefaultCamelReactiveStreamsService.java
@@ -139,7 +139,7 @@ public class DefaultCamelReactiveStreamsService extends ServiceSupport implement
return (Subscriber<T>) streamSubscriber(name);
}
- return new ConvertingSubscriber<>(streamSubscriber(name), context);
+ return new ConvertingSubscriber<>(streamSubscriber(name), context, type);
}
@Override
@@ -249,7 +249,7 @@ public class DefaultCamelReactiveStreamsService extends ServiceSupport implement
@Override
public <T> Subscriber<T> subscriber(String uri, Class<T> type) {
- return new ConvertingSubscriber<>(subscriber(uri), context);
+ return new ConvertingSubscriber<>(subscriber(uri), context, type);
}
@Override
diff --git a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/ConvertingSubscriber.java b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/ConvertingSubscriber.java
index 3e4b375..90e830a 100644
--- a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/ConvertingSubscriber.java
+++ b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/ConvertingSubscriber.java
@@ -29,14 +29,18 @@ import org.reactivestreams.Subscription;
*/
public class ConvertingSubscriber<R> implements Subscriber<R> {
+ private Class<R> type;
+
private Subscriber<Exchange> delegate;
private CamelContext context;
- public ConvertingSubscriber(Subscriber<Exchange> delegate, CamelContext context) {
+ public ConvertingSubscriber(Subscriber<Exchange> delegate, CamelContext context, Class<R> type) {
Objects.requireNonNull(delegate, "delegate subscriber cannot be null");
+ Objects.requireNonNull(type, "type cannot be null");
this.delegate = delegate;
this.context = context;
+ this.type = type;
}
@Override
@@ -55,7 +59,7 @@ public class ConvertingSubscriber<R> implements Subscriber<R> {
}
Exchange exchange = new DefaultExchange(context);
- exchange.getIn().setBody(r);
+ exchange.getIn().setBody(r, type);
delegate.onNext(exchange);
}
diff --git a/components/camel-reactor/src/main/java/org/apache/camel/component/reactor/engine/ReactorStreamsService.java b/components/camel-reactor/src/main/java/org/apache/camel/component/reactor/engine/ReactorStreamsService.java
index c1ec616..fee248d 100644
--- a/components/camel-reactor/src/main/java/org/apache/camel/component/reactor/engine/ReactorStreamsService.java
+++ b/components/camel-reactor/src/main/java/org/apache/camel/component/reactor/engine/ReactorStreamsService.java
@@ -115,7 +115,7 @@ final class ReactorStreamsService extends ServiceSupport implements CamelReactiv
return Subscriber.class.cast(subscriber);
}
- return new ConvertingSubscriber<>(subscriber, context);
+ return new ConvertingSubscriber<>(subscriber, context, type);
}
@Override
@@ -190,7 +190,7 @@ final class ReactorStreamsService extends ServiceSupport implements CamelReactiv
@Override
public <T> Subscriber<T> subscriber(String uri, Class<T> type) {
- return new ConvertingSubscriber<>(subscriber(uri), context);
+ return new ConvertingSubscriber<>(subscriber(uri), context, type);
}
@Override
diff --git a/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsService.java b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsService.java
index b367ec9..50e83a1 100644
--- a/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsService.java
+++ b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsService.java
@@ -115,7 +115,7 @@ final class RxJavaStreamsService extends ServiceSupport implements CamelReactive
return Subscriber.class.cast(subscriber);
}
- return new ConvertingSubscriber<>(subscriber, context);
+ return new ConvertingSubscriber<>(subscriber, context, type);
}
@Override
@@ -185,7 +185,7 @@ final class RxJavaStreamsService extends ServiceSupport implements CamelReactive
@Override
public <T> Subscriber<T> subscriber(String uri, Class<T> type) {
- return new ConvertingSubscriber<>(subscriber(uri), context);
+ return new ConvertingSubscriber<>(subscriber(uri), context, type);
}
@Override
[camel] 03/11: Upgrade CXF plugins
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d7ed7942ccc13fc9ff6b0f7381e749e6304ad52d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Nov 25 09:40:43 2019 +0100
Upgrade CXF plugins
---
parent/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index dc896e3..d5f4ae0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -155,9 +155,9 @@
<curator-version>2.12.0</curator-version>
<cxf-version>3.3.4</cxf-version>
<cxf-version-range>[3.3,4.0)</cxf-version-range>
- <cxf-codegen-plugin-version>3.3.2</cxf-codegen-plugin-version>
- <cxf-xjc-plugin-version>3.2.0</cxf-xjc-plugin-version>
- <cxf-xjc-utils-version>3.2.0</cxf-xjc-utils-version>
+ <cxf-codegen-plugin-version>3.3.4</cxf-codegen-plugin-version>
+ <cxf-xjc-plugin-version>3.3.0</cxf-xjc-plugin-version>
+ <cxf-xjc-utils-version>3.3.0</cxf-xjc-utils-version>
<deltaspike-version>1.9.0</deltaspike-version>
<depends-maven-plugin-version>1.4.0</depends-maven-plugin-version>
<derby-version>10.14.2.0</derby-version>
[camel] 01/11: spring boot groupId fix
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a28ed8d22ca7661acbd30d44b3dee6e830c3cd10
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Nov 24 17:50:01 2019 +0100
spring boot groupId fix
---
platforms/spring-boot/spring-boot-dm/README.adoc | 2 +-
.../java/org/apache/camel/itest/springboot/util/BOMResolver.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/platforms/spring-boot/spring-boot-dm/README.adoc b/platforms/spring-boot/spring-boot-dm/README.adoc
index 3af7326..4ebb7c7 100644
--- a/platforms/spring-boot/spring-boot-dm/README.adoc
+++ b/platforms/spring-boot/spring-boot-dm/README.adoc
@@ -24,7 +24,7 @@ The POM of a end user application should include both BOMs, as in the following
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-dependencies</artifactId>
<version>${project.version}</version>
<type>pom</type>
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/BOMResolver.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/BOMResolver.java
index 0d07191..422acc9 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/BOMResolver.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/BOMResolver.java
@@ -117,13 +117,13 @@ public final class BOMResolver {
Artifact camelParent = new DefaultArtifact("org.apache.camel:camel-parent:pom:"
+ camelVersion).setFile(camelRoot("parent/pom.xml"));
neededArtifacts.add(camelParent);
- neededArtifacts.add(new DefaultArtifact("org.apache.camel:spring-boot:pom:"
+ neededArtifacts.add(new DefaultArtifact("org.apache.camel.springboot:spring-boot:pom:"
+ camelVersion).setFile(camelRoot("platforms/spring-boot/pom.xml")));
- neededArtifacts.add(new DefaultArtifact("org.apache.camel:camel-spring-boot-dm:pom:"
+ neededArtifacts.add(new DefaultArtifact("org.apache.camel.springboot:camel-spring-boot-dm:pom:"
+ camelVersion).setFile(camelRoot("platforms/spring-boot/spring-boot-dm/pom.xml")));
- neededArtifacts.add(new DefaultArtifact("org.apache.camel:camel-spring-boot-dependencies:pom:"
+ neededArtifacts.add(new DefaultArtifact("org.apache.camel.springboot:camel-spring-boot-dependencies:pom:"
+ camelVersion).setFile(camelRoot("platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml")));
- Artifact camelStarterParent = new DefaultArtifact("org.apache.camel:camel-starter-parent:pom:"
+ Artifact camelStarterParent = new DefaultArtifact("org.apache.camel.springboot:camel-starter-parent:pom:"
+ camelVersion).setFile(camelRoot("platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml"));
neededArtifacts.add(camelStarterParent);
[camel] 08/11: Upgrade Jandex to version 2.1.2.Final
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7e15463e0128327578525ab12303f7ca4df19f88
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 26 12:44:09 2019 +0100
Upgrade Jandex to version 2.1.2.Final
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index bfb8062..cf89855 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -302,7 +302,7 @@
<jackrabbit-guava-version>15.0</jackrabbit-guava-version>
<jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version>
<jasminb-jsonapi-version>0.9</jasminb-jsonapi-version>
- <jandex-version>2.1.1.Final</jandex-version>
+ <jandex-version>2.1.2.Final</jandex-version>
<jasn1-version>1.11.2</jasn1-version>
<jasypt-bundle-version>1.9.3_1</jasypt-bundle-version>
<jasypt-version>1.9.3</jasypt-version>
[camel] 05/11: Fixed CS
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fb2162f88c2c48d60fafafd5f3c2177df3289bdf
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Nov 26 05:20:05 2019 +0100
Fixed CS
---
.../src/main/java/org/apache/camel/component/jms/JmsComponent.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
index 1adf458..0183626 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.jms;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutorService;
+
import javax.jms.ConnectionFactory;
import javax.jms.ExceptionListener;
import javax.jms.Message;
[camel] 10/11: Upgrade Xchange to version 4.4.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5f7c8e2f15043ec037fef9173a7e38a532e6c6f9
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 26 15:15:24 2019 +0100
Upgrade Xchange to version 4.4.1
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ff894d6..d27d3b5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -656,7 +656,7 @@
<xalan-version>2.7.2</xalan-version>
<xbean-spring-version>4.14</xbean-spring-version>
<xbean-asm5-shaded-version>4.5</xbean-asm5-shaded-version>
- <xchange-version>4.4.0</xchange-version>
+ <xchange-version>4.4.1</xchange-version>
<xerces-bundle-version>2.12.0_1</xerces-bundle-version>
<xerces-version>2.12.0</xerces-version>
<!-- needed to manage the xml-apis version in camel-xmljson -->
[camel] 04/11: Regen
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8caee32ab5450718b9743427b4347802ccc39888
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Nov 26 05:18:18 2019 +0100
Regen
---
components/camel-jms/src/main/docs/jms-component.adoc | 4 +++-
docs/components/modules/ROOT/pages/jms-component.adoc | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc b/components/camel-jms/src/main/docs/jms-component.adoc
index 48e97b4..a6c892a 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -430,7 +430,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 83 options, which are listed below.
+The component supports 85 options, which are listed below.
@@ -441,6 +441,8 @@ The component supports 83 options, which are listed below.
| *camel.component.jms.acknowledgement-mode* | 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. | | Integer
| *camel.component.jms.acknowledgement-mode-name* | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | String
| *camel.component.jms.allow-additional-headers* | 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 with header names using prefix JMS_IBM_MQMD_ containing values with byte array or other invalid types. You can specify multiple header names separated by comma, and use as suffix for wildcard matching. | | String
+| *camel.component.jms.allow-auto-wired-connection-factory* | Whether to auto-discover ConnectionFactory from the registry, if no connection factory has been configured. If only one instance of ConnectionFactory is found then it will be used. This is enabled by default. | false | Boolean
+| *camel.component.jms.allow-auto-wired-destination-resolver* | Whether to auto-discover DestinationResolver from the registry, if no destination resolver has been configured. If only one instance of DestinationResolver is found then it will be used. This is enabled by default. | false | Boolean
| *camel.component.jms.allow-null-body* | 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
| *camel.component.jms.allow-reply-manager-quick-stop* | Whether the DefaultMessageListenerContainer used in the reply managers for request-reply messaging allow the DefaultMessageListenerContainer.runningAllowed flag to quick stop in case JmsConfiguration#isAcceptMessagesWhileStopping 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 fl [...]
| *camel.component.jms.always-copy-message* | 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
diff --git a/docs/components/modules/ROOT/pages/jms-component.adoc b/docs/components/modules/ROOT/pages/jms-component.adoc
index 8eca6f6..2cdcec5 100644
--- a/docs/components/modules/ROOT/pages/jms-component.adoc
+++ b/docs/components/modules/ROOT/pages/jms-component.adoc
@@ -431,7 +431,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 83 options, which are listed below.
+The component supports 85 options, which are listed below.
@@ -442,6 +442,8 @@ The component supports 83 options, which are listed below.
| *camel.component.jms.acknowledgement-mode* | 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. | | Integer
| *camel.component.jms.acknowledgement-mode-name* | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | String
| *camel.component.jms.allow-additional-headers* | 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 with header names using prefix JMS_IBM_MQMD_ containing values with byte array or other invalid types. You can specify multiple header names separated by comma, and use as suffix for wildcard matching. | | String
+| *camel.component.jms.allow-auto-wired-connection-factory* | Whether to auto-discover ConnectionFactory from the registry, if no connection factory has been configured. If only one instance of ConnectionFactory is found then it will be used. This is enabled by default. | false | Boolean
+| *camel.component.jms.allow-auto-wired-destination-resolver* | Whether to auto-discover DestinationResolver from the registry, if no destination resolver has been configured. If only one instance of DestinationResolver is found then it will be used. This is enabled by default. | false | Boolean
| *camel.component.jms.allow-null-body* | 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
| *camel.component.jms.allow-reply-manager-quick-stop* | Whether the DefaultMessageListenerContainer used in the reply managers for request-reply messaging allow the DefaultMessageListenerContainer.runningAllowed flag to quick stop in case JmsConfiguration#isAcceptMessagesWhileStopping 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 fl [...]
| *camel.component.jms.always-copy-message* | 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