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 2017/01/19 19:18:32 UTC
[3/3] camel git commit: CAMEL-10726: Regen
CAMEL-10726: Regen
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a4f82a2c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a4f82a2c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a4f82a2c
Branch: refs/heads/master
Commit: a4f82a2c9a03a8d7dbd2a391d77fe77f66789c96
Parents: cb8da77
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jan 19 20:18:21 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jan 19 20:18:21 2017 +0100
----------------------------------------------------------------------
.../camel-jms/src/main/docs/jms-component.adoc | 3 ++-
.../jms/springboot/JmsComponentConfiguration.java | 17 +++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a4f82a2c/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 a59c32c..9c845d3 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -197,7 +197,7 @@ about these properties by consulting the relevant Spring documentation.
// component options: START
-The JMS component supports 74 options which are listed below.
+The JMS component supports 75 options which are listed below.
@@ -278,6 +278,7 @@ The JMS component supports 74 options which are listed below.
| messageCreatedStrategy | advanced | | MessageCreatedStrategy | 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.
| waitForProvisionCorrelationToBeUpdatedCounter | advanced | 50 | int | 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.
| waitForProvisionCorrelationToBeUpdatedThreadSleepingTime | advanced | 100 | long | Interval in millis to sleep each time while waiting for provisional correlation id to be updated.
+| correlationProperty | producer (advanced) | | String | 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.
| headerFilterStrategy | filter | | HeaderFilterStrategy | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.
|=======================================================================
{% endraw %}
http://git-wip-us.apache.org/repos/asf/camel/blob/a4f82a2c/platforms/spring-boot/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
----------------------------------------------------------------------
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 18086d2..ee464ce 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
@@ -555,6 +555,15 @@ public class JmsComponentConfiguration {
*/
private Long waitForProvisionCorrelationToBeUpdatedThreadSleepingTime = 100L;
/**
+ * 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.
+ */
+ private String correlationProperty;
+ /**
* To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
* header to and from Camel message.
*/
@@ -1162,6 +1171,14 @@ public class JmsComponentConfiguration {
this.waitForProvisionCorrelationToBeUpdatedThreadSleepingTime = waitForProvisionCorrelationToBeUpdatedThreadSleepingTime;
}
+ public String getCorrelationProperty() {
+ return correlationProperty;
+ }
+
+ public void setCorrelationProperty(String correlationProperty) {
+ this.correlationProperty = correlationProperty;
+ }
+
public HeaderFilterStrategy getHeaderFilterStrategy() {
return headerFilterStrategy;
}