This is an automated email from the ASF dual-hosted git repository.
janbednar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dd29fb0e16e133685b29760e37fc49f41601b361
Author: Jan Bednář <m...@janbednar.eu>
AuthorDate: Sat Aug 10 18:22:22 2019 +0200
CAMEL-13786: regen
---
components/camel-activemq/src/main/docs/activemq-component.adoc | 2 +-
components/camel-amqp/src/main/docs/amqp-component.adoc | 2 +-
components/camel-jms/src/main/docs/jms-component.adoc | 5 +++--
.../main/java/org/apache/camel/component/jms/JmsConfiguration.java | 2 +-
.../camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java | 6 ++++--
.../camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java | 6 ++++--
.../camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java | 6 ++++--
docs/components/modules/ROOT/pages/activemq-component.adoc | 3 ++-
docs/components/modules/ROOT/pages/amqp-component.adoc | 3 ++-
docs/components/modules/ROOT/pages/jms-component.adoc | 6 ++++--
.../camel/component/jms/springboot/JmsComponentConfiguration.java | 3 ++-
11 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/components/camel-activemq/src/main/docs/activemq-component.adoc
b/components/camel-activemq/src/main/docs/activemq-component.adoc
index b251fd6..ac45242 100644
--- a/components/camel-activemq/src/main/docs/activemq-component.adoc
+++ b/components/camel-activemq/src/main/docs/activemq-component.adoc
@@ -198,7 +198,7 @@ with the following path and query parameters:
| *exposeListenerSession* (consumer) | Specifies whether the listener session
should be exposed when consuming messages. | false | boolean
| *replyToSameDestination Allowed* (consumer) | Whether a JMS consumer is
allowed to send a reply message to the same destination that the consumer is
using to consume from. This prevents an endless loop by consuming and sending
back the same message to itself. | false | boolean
| *taskExecutor* (consumer) | Allows you to specify a custom task executor for
consuming messages. | | TaskExecutor
-| *deliveryDelay* (producer) | Sets delivery delay to use for send calls for
JMS. | -1 | long
+| *deliveryDelay* (producer) | Sets delivery delay to use for send calls for
JMS. This option requires JMS 2.0 compliant broker. | -1 | long
| *deliveryMode* (producer) | Specifies the delivery mode to be used.
Possibles values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT =
1 and PERSISTENT = 2. | | Integer
| *deliveryPersistent* (producer) | Specifies whether persistent delivery is
used by default. | true | boolean
| *explicitQosEnabled* (producer) | Set if the deliveryMode, priority or
timeToLive qualities of service should be used when sending messages. This
option is based on Spring's JmsTemplate. The deliveryMode, priority and
timeToLive options are applied to the current endpoint. This contrasts with the
preserveMessageQos option, which operates at message granularity, reading QoS
properties exclusively from the Camel In message headers. | 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 6f00c4f..15b7dfc 100644
--- a/components/camel-amqp/src/main/docs/amqp-component.adoc
+++ b/components/camel-amqp/src/main/docs/amqp-component.adoc
@@ -188,7 +188,7 @@ with the following path and query parameters:
| *exposeListenerSession* (consumer) | Specifies whether the listener session
should be exposed when consuming messages. | false | boolean
| *replyToSameDestination Allowed* (consumer) | Whether a JMS consumer is
allowed to send a reply message to the same destination that the consumer is
using to consume from. This prevents an endless loop by consuming and sending
back the same message to itself. | false | boolean
| *taskExecutor* (consumer) | Allows you to specify a custom task executor for
consuming messages. | | TaskExecutor
-| *deliveryDelay* (producer) | Sets delivery delay to use for send calls for
JMS. | -1 | long
+| *deliveryDelay* (producer) | Sets delivery delay to use for send calls for
JMS. This option requires JMS 2.0 compliant broker. | -1 | long
| *deliveryMode* (producer) | Specifies the delivery mode to be used.
Possibles values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT =
1 and PERSISTENT = 2. | | Integer
| *deliveryPersistent* (producer) | Specifies whether persistent delivery is
used by default. | true | boolean
| *explicitQosEnabled* (producer) | Set if the deliveryMode, priority or
timeToLive qualities of service should be used when sending messages. This
option is based on Spring's JmsTemplate. The deliveryMode, priority and
timeToLive options are applied to the current endpoint. This contrasts with the
preserveMessageQos option, which operates at message granularity, reading QoS
properties exclusively from the Camel In message headers. | false | Boolean
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc
b/components/camel-jms/src/main/docs/jms-component.adoc
index 405d99f..3e1b79a 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -355,7 +355,7 @@ with the following path and query parameters:
| *exposeListenerSession* (consumer) | Specifies whether the listener session
should be exposed when consuming messages. | false | boolean
| *replyToSameDestination Allowed* (consumer) | Whether a JMS consumer is
allowed to send a reply message to the same destination that the consumer is
using to consume from. This prevents an endless loop by consuming and sending
back the same message to itself. | false | boolean
| *taskExecutor* (consumer) | Allows you to specify a custom task executor for
consuming messages. | | TaskExecutor
-| *deliveryDelay* (producer) | Sets delivery delay to use for send calls for
JMS. | -1 | long
+| *deliveryDelay* (producer) | Sets delivery delay to use for send calls for
JMS. This option requires JMS 2.0 compliant broker. | -1 | long
| *deliveryMode* (producer) | Specifies the delivery mode to be used.
Possibles values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT =
1 and PERSISTENT = 2. | | Integer
| *deliveryPersistent* (producer) | Specifies whether persistent delivery is
used by default. | true | boolean
| *explicitQosEnabled* (producer) | Set if the deliveryMode, priority or
timeToLive qualities of service should be used when sending messages. This
option is based on Spring's JmsTemplate. The deliveryMode, priority and
timeToLive options are applied to the current endpoint. This contrasts with the
preserveMessageQos option, which operates at message granularity, reading QoS
properties exclusively from the Camel In message headers. | false | Boolean
@@ -436,7 +436,7 @@ When using Spring Boot make sure to use the following Maven
dependency to have s
----
-The component supports 169 options, which are listed below.
+The component supports 170 options, which are listed below.
@@ -479,6 +479,7 @@ The component supports 169 options, which are listed below.
| *camel.component.jms.configuration.consumer-type* | The consumer type to
use, which can be one of: Simple, Default, or Custom. The consumer type
determines which Spring JMS listener to use. Default will use
org.springframework.jms.listener.DefaultMessageListenerContainer, Simple will
use org.springframework.jms.listener.SimpleMessageListenerContainer. When
Custom is specified, the MessageListenerContainerFactory defined by the
messageListenerContainerFactory option will determine what [...]
| *camel.component.jms.configuration.correlation-property* | Use this JMS
property to correlate messages in InOut exchange pattern (request-reply)
instead of JMSCorrelationID property. This allows you to exchange messages with
systems that do not correlate messages using JMSCorrelationID JMS property. If
used JMSCorrelationID will not be used or set by Camel. The value of here named
property will be generated if not supplied in the header of the message under
the same name. | | String
| *camel.component.jms.configuration.default-task-executor-type* | 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 consum [...]
+| *camel.component.jms.configuration.delivery-delay* | Sets delivery delay to
use for send calls for JMS. This option requires JMS 2.0 compliant broker. | -1
| Long
| *camel.component.jms.configuration.delivery-mode* | Specifies the delivery
mode to be used. Possibles values are those defined by javax.jms.DeliveryMode.
NON_PERSISTENT = 1 and PERSISTENT = 2. | | Integer
| *camel.component.jms.configuration.delivery-persistent* | Specifies whether
persistent delivery is used by default. | true | Boolean
| *camel.component.jms.configuration.destination-resolver* | A pluggable
org.springframework.jms.support.destination.DestinationResolver that allows you
to use your own resolver (for example, to lookup the real destination in a JNDI
registry). | | DestinationResolver
diff --git
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
index 37cc482..7109b35 100644
---
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
+++
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
@@ -2178,7 +2178,7 @@ public class JmsConfiguration implements Cloneable {
}
/**
- * Sets delivery delay to use for send calls for JMS.
+ * Sets delivery delay to use for send calls for JMS. This option requires
JMS 2.0 compliant broker.
*/
public void setDeliveryDelay(long deliveryDelay) {
this.deliveryDelay = deliveryDelay;
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
index a238d9e..5f64924 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
@@ -2186,7 +2186,8 @@ public interface AMQPEndpointBuilderFactory {
return this;
}
/**
- * Sets delivery delay to use for send calls for JMS.
+ * Sets delivery delay to use for send calls for JMS. This option
+ * requires JMS 2.0 compliant broker.
*
* The option is a: <code>long</code> type.
*
@@ -2197,7 +2198,8 @@ public interface AMQPEndpointBuilderFactory {
return this;
}
/**
- * Sets delivery delay to use for send calls for JMS.
+ * Sets delivery delay to use for send calls for JMS. This option
+ * requires JMS 2.0 compliant broker.
*
* The option will be converted to a <code>long</code> type.
*
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
index ea56460..6110212 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
@@ -2194,7 +2194,8 @@ public interface ActiveMQEndpointBuilderFactory {
return this;
}
/**
- * Sets delivery delay to use for send calls for JMS.
+ * Sets delivery delay to use for send calls for JMS. This option
+ * requires JMS 2.0 compliant broker.
*
* The option is a: <code>long</code> type.
*
@@ -2205,7 +2206,8 @@ public interface ActiveMQEndpointBuilderFactory {
return this;
}
/**
- * Sets delivery delay to use for send calls for JMS.
+ * Sets delivery delay to use for send calls for JMS. This option
+ * requires JMS 2.0 compliant broker.
*
* The option will be converted to a <code>long</code> type.
*
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
index c6c4d58..82623f5 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
@@ -2185,7 +2185,8 @@ public interface JmsEndpointBuilderFactory {
return this;
}
/**
- * Sets delivery delay to use for send calls for JMS.
+ * Sets delivery delay to use for send calls for JMS. This option
+ * requires JMS 2.0 compliant broker.
*
* The option is a: <code>long</code> type.
*
@@ -2196,7 +2197,8 @@ public interface JmsEndpointBuilderFactory {
return this;
}
/**
- * Sets delivery delay to use for send calls for JMS.
+ * Sets delivery delay to use for send calls for JMS. This option
+ * requires JMS 2.0 compliant broker.
*
* The option will be converted to a <code>long</code> type.
*
diff --git a/docs/components/modules/ROOT/pages/activemq-component.adoc
b/docs/components/modules/ROOT/pages/activemq-component.adoc
index 9fd81ea..ac45242 100644
--- a/docs/components/modules/ROOT/pages/activemq-component.adoc
+++ b/docs/components/modules/ROOT/pages/activemq-component.adoc
@@ -162,7 +162,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (92 parameters):
+=== Query Parameters (93 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -198,6 +198,7 @@ with the following path and query parameters:
| *exposeListenerSession* (consumer) | Specifies whether the listener session
should be exposed when consuming messages. | false | boolean
| *replyToSameDestination Allowed* (consumer) | Whether a JMS consumer is
allowed to send a reply message to the same destination that the consumer is
using to consume from. This prevents an endless loop by consuming and sending
back the same message to itself. | false | boolean
| *taskExecutor* (consumer) | Allows you to specify a custom task executor for
consuming messages. | | TaskExecutor
+| *deliveryDelay* (producer) | Sets delivery delay to use for send calls for
JMS. This option requires JMS 2.0 compliant broker. | -1 | long
| *deliveryMode* (producer) | Specifies the delivery mode to be used.
Possibles values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT =
1 and PERSISTENT = 2. | | Integer
| *deliveryPersistent* (producer) | Specifies whether persistent delivery is
used by default. | true | boolean
| *explicitQosEnabled* (producer) | Set if the deliveryMode, priority or
timeToLive qualities of service should be used when sending messages. This
option is based on Spring's JmsTemplate. The deliveryMode, priority and
timeToLive options are applied to the current endpoint. This contrasts with the
preserveMessageQos option, which operates at message granularity, reading QoS
properties exclusively from the Camel In message headers. | false | Boolean
diff --git a/docs/components/modules/ROOT/pages/amqp-component.adoc
b/docs/components/modules/ROOT/pages/amqp-component.adoc
index 5a973ef..15b7dfc 100644
--- a/docs/components/modules/ROOT/pages/amqp-component.adoc
+++ b/docs/components/modules/ROOT/pages/amqp-component.adoc
@@ -152,7 +152,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (92 parameters):
+=== Query Parameters (93 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -188,6 +188,7 @@ with the following path and query parameters:
| *exposeListenerSession* (consumer) | Specifies whether the listener session
should be exposed when consuming messages. | false | boolean
| *replyToSameDestination Allowed* (consumer) | Whether a JMS consumer is
allowed to send a reply message to the same destination that the consumer is
using to consume from. This prevents an endless loop by consuming and sending
back the same message to itself. | false | boolean
| *taskExecutor* (consumer) | Allows you to specify a custom task executor for
consuming messages. | | TaskExecutor
+| *deliveryDelay* (producer) | Sets delivery delay to use for send calls for
JMS. This option requires JMS 2.0 compliant broker. | -1 | long
| *deliveryMode* (producer) | Specifies the delivery mode to be used.
Possibles values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT =
1 and PERSISTENT = 2. | | Integer
| *deliveryPersistent* (producer) | Specifies whether persistent delivery is
used by default. | true | boolean
| *explicitQosEnabled* (producer) | Set if the deliveryMode, priority or
timeToLive qualities of service should be used when sending messages. This
option is based on Spring's JmsTemplate. The deliveryMode, priority and
timeToLive options are applied to the current endpoint. This contrasts with the
preserveMessageQos option, which operates at message granularity, reading QoS
properties exclusively from the Camel In message headers. | false | Boolean
diff --git a/docs/components/modules/ROOT/pages/jms-component.adoc
b/docs/components/modules/ROOT/pages/jms-component.adoc
index 7be325d..3e1b79a 100644
--- a/docs/components/modules/ROOT/pages/jms-component.adoc
+++ b/docs/components/modules/ROOT/pages/jms-component.adoc
@@ -319,7 +319,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (92 parameters):
+=== Query Parameters (93 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -355,6 +355,7 @@ with the following path and query parameters:
| *exposeListenerSession* (consumer) | Specifies whether the listener session
should be exposed when consuming messages. | false | boolean
| *replyToSameDestination Allowed* (consumer) | Whether a JMS consumer is
allowed to send a reply message to the same destination that the consumer is
using to consume from. This prevents an endless loop by consuming and sending
back the same message to itself. | false | boolean
| *taskExecutor* (consumer) | Allows you to specify a custom task executor for
consuming messages. | | TaskExecutor
+| *deliveryDelay* (producer) | Sets delivery delay to use for send calls for
JMS. This option requires JMS 2.0 compliant broker. | -1 | long
| *deliveryMode* (producer) | Specifies the delivery mode to be used.
Possibles values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT =
1 and PERSISTENT = 2. | | Integer
| *deliveryPersistent* (producer) | Specifies whether persistent delivery is
used by default. | true | boolean
| *explicitQosEnabled* (producer) | Set if the deliveryMode, priority or
timeToLive qualities of service should be used when sending messages. This
option is based on Spring's JmsTemplate. The deliveryMode, priority and
timeToLive options are applied to the current endpoint. This contrasts with the
preserveMessageQos option, which operates at message granularity, reading QoS
properties exclusively from the Camel In message headers. | false | Boolean
@@ -435,7 +436,7 @@ When using Spring Boot make sure to use the following Maven
dependency to have s
----
-The component supports 169 options, which are listed below.
+The component supports 170 options, which are listed below.
@@ -478,6 +479,7 @@ The component supports 169 options, which are listed below.
| *camel.component.jms.configuration.consumer-type* | The consumer type to
use, which can be one of: Simple, Default, or Custom. The consumer type
determines which Spring JMS listener to use. Default will use
org.springframework.jms.listener.DefaultMessageListenerContainer, Simple will
use org.springframework.jms.listener.SimpleMessageListenerContainer. When
Custom is specified, the MessageListenerContainerFactory defined by the
messageListenerContainerFactory option will determine what [...]
| *camel.component.jms.configuration.correlation-property* | Use this JMS
property to correlate messages in InOut exchange pattern (request-reply)
instead of JMSCorrelationID property. This allows you to exchange messages with
systems that do not correlate messages using JMSCorrelationID JMS property. If
used JMSCorrelationID will not be used or set by Camel. The value of here named
property will be generated if not supplied in the header of the message under
the same name. | | String
| *camel.component.jms.configuration.default-task-executor-type* | 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 consum [...]
+| *camel.component.jms.configuration.delivery-delay* | Sets delivery delay to
use for send calls for JMS. This option requires JMS 2.0 compliant broker. | -1
| Long
| *camel.component.jms.configuration.delivery-mode* | Specifies the delivery
mode to be used. Possibles values are those defined by javax.jms.DeliveryMode.
NON_PERSISTENT = 1 and PERSISTENT = 2. | | Integer
| *camel.component.jms.configuration.delivery-persistent* | Specifies whether
persistent delivery is used by default. | true | Boolean
| *camel.component.jms.configuration.destination-resolver* | A pluggable
org.springframework.jms.support.destination.DestinationResolver that allows you
to use your own resolver (for example, to lookup the real destination in a JNDI
registry). | | DestinationResolver
diff --git
a/platforms/spring-boot/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
b/platforms/spring-boot/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
index 8df7569..64e4415 100644
---
a/platforms/spring-boot/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
@@ -1945,7 +1945,8 @@ public class JmsComponentConfiguration
*/
private Boolean formatDateHeadersToIso8601 = false;
/**
- * Sets delivery delay to use for send calls for JMS.
+ * Sets delivery delay to use for send calls for JMS. This option
+ * requires JMS 2.0 compliant broker.
*/
private Long deliveryDelay = -1L;
