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 2021/01/06 11:44:02 UTC

[camel] branch master updated (38ba0ee -> b204308)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 38ba0ee  (chores) cross component logging fixes (#4832)
     new 73cd7d6  CAMEL-15990: camel-sjms - Support regular connection pool. CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms (producer)
     new a2896cf  polished code
     new 6bec00f  CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms (consumer)
     new 5369203  CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms (producer)
     new 8709742  camel-main - Remove option that was removed
     new 8c741e2  CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms (producer)
     new b204308  CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms (migrate)

The 7 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:
 .../org/apache/camel/catalog/components.properties |    1 -
 .../org/apache/camel/catalog/components/jms.json   |    4 +-
 .../camel/catalog/components/sjms-batch.json       |   58 -
 .../org/apache/camel/catalog/components/sjms.json  |   56 +-
 .../org/apache/camel/catalog/components/sjms2.json |   56 +-
 .../org/apache/camel/catalog/docs.properties       |    1 -
 .../apache/camel/catalog/docs/jms-component.adoc   |    4 +-
 .../camel/catalog/docs/sjms-batch-component.adoc   |  207 --
 .../apache/camel/catalog/docs/sjms-component.adoc  |  362 +---
 .../apache/camel/catalog/docs/sjms2-component.adoc |  513 ++---
 .../org/apache/camel/component/jms/jms.json        |    4 +-
 .../camel-jms/src/main/docs/jms-component.adoc     |    4 +-
 .../camel/component/jms/JmsConfiguration.java      |    2 +-
 .../apache/camel/component/jms/JmsProducer.java    |   20 +-
 components/camel-sjms/pom.xml                      |   11 +-
 .../component/sjms/SjmsComponentConfigurer.java    |   84 +-
 .../component/sjms/SjmsEndpointConfigurer.java     |  249 ++-
 .../component/sjms/SjmsEndpointUriFactory.java     |   45 +-
 .../sjms/batch/SjmsBatchComponentConfigurer.java   |   79 -
 .../sjms/batch/SjmsBatchEndpointConfigurer.java    |  178 --
 .../sjms/batch/SjmsBatchEndpointUriFactory.java    |   84 -
 .../services/org/apache/camel/component.properties |    2 +-
 .../services/org/apache/camel/component/sjms-batch |    2 -
 .../apache/camel/configurer/sjms-batch-component   |    2 -
 .../apache/camel/configurer/sjms-batch-endpoint    |    2 -
 .../apache/camel/urifactory/sjms-batch-endpoint    |    2 -
 .../camel/component/sjms/batch/sjms-batch.json     |   58 -
 .../org/apache/camel/component/sjms/sjms.json      |   67 +-
 .../src/main/docs/sjms-batch-component.adoc        |  207 --
 .../camel-sjms/src/main/docs/sjms-component.adoc   |  362 +---
 .../sjms/AggregatedExceptionListener.java          |   53 -
 .../component/sjms/MessageConsumerResources.java   |   54 -
 ...onstants.java => MessageListenerContainer.java} |   16 +-
 .../camel/component/sjms/MessageProducerPool.java  |   75 -
 .../component/sjms/MessageProducerResources.java   |   69 -
 ...sactionCommitStrategy.java => ReplyToType.java} |   19 +-
 .../{SjmsConstants.java => SessionCallback.java}   |   16 +-
 ...sConstants.java => SessionMessageListener.java} |   10 +-
 .../apache/camel/component/sjms/SjmsComponent.java |  258 +--
 .../apache/camel/component/sjms/SjmsConstants.java |    2 +
 .../apache/camel/component/sjms/SjmsConsumer.java  |  433 +---
 .../apache/camel/component/sjms/SjmsEndpoint.java  |  829 ++++----
 .../apache/camel/component/sjms/SjmsHelper.java    |  112 ++
 .../sjms/SjmsLoggingExceptionListener.java         |   46 -
 .../apache/camel/component/sjms/SjmsProducer.java  |  713 +++----
 .../apache/camel/component/sjms/SjmsTemplate.java  |  171 ++
 .../component/sjms/TransactionCommitStrategy.java  |   44 -
 .../component/sjms/TransactionOnCompletion.java    |   64 +
 .../component/sjms/batch/SessionCompletion.java    |   57 -
 .../component/sjms/batch/SjmsBatchComponent.java   |   97 -
 .../component/sjms/batch/SjmsBatchConsumer.java    |  604 ------
 .../component/sjms/batch/SjmsBatchEndpoint.java    |  427 ----
 .../sjms/consumer/AbstractMessageHandler.java      |  175 --
 .../sjms/consumer/EndpointMessageListener.java     |  457 +++++
 .../sjms/consumer/InOnlyMessageHandler.java        |   86 -
 .../sjms/consumer/InOutMessageHandler.java         |  175 --
 .../consumer/SimpleMessageListenerContainer.java   |  343 ++++
 .../sjms/jms/ConnectionFactoryResource.java        |  189 --
 .../component/sjms/jms/ConnectionResource.java     |   50 -
 .../component/sjms/jms/DestinationNameParser.java  |   10 +-
 .../component/sjms/jms/Jms11ObjectFactory.java     |   46 +-
 .../camel/component/sjms/jms/JmsBinding.java       |   68 +-
 .../camel/component/sjms/jms/JmsMessageHelper.java |   16 +
 .../camel/component/sjms/jms/JmsObjectFactory.java |    6 +
 ...galHeaderException.java => MessageCreator.java} |   39 +-
 .../component/sjms/producer/InOnlyProducer.java    |   93 -
 .../component/sjms/producer/InOutProducer.java     |  350 ----
 .../sjms/reply/CorrelationTimeoutMap.java          |   70 +
 .../ExclusiveQueueMessageListenerContainer.java    |   55 +
 .../sjms/reply/MessageSelectorCreator.java         |   86 +
 .../component/sjms/reply/QueueReplyHandler.java}   |   29 +-
 .../component/sjms/reply/QueueReplyManager.java    |  126 ++
 .../ReplyHandler.java}                             |   32 +-
 .../camel/component/sjms/reply/ReplyHolder.java    |  124 ++
 .../camel/component/sjms/reply/ReplyManager.java   |   97 +
 .../component/sjms/reply/ReplyManagerSupport.java  |  246 +++
 .../TemporaryQueueMessageListenerContainer.java    |   50 +
 .../sjms/reply/TemporaryQueueReplyHandler.java     |   64 +
 .../sjms/reply/TemporaryQueueReplyManager.java     |  155 ++
 .../camel/component/sjms}/reply/package.html       |    0
 .../sjms/taskmanager/TimedTaskManager.java         |   52 -
 .../sjms/tx/BatchTransactionCommitStrategy.java    |   59 -
 .../tx/SessionBatchTransactionSynchronization.java |  155 --
 .../sjms/tx/SessionTransactionSynchronization.java |   81 -
 .../component/sjms/ReconnectInOutProducerTest.java |   10 +-
 .../component/sjms/ReconnectProducerTest.java      |    9 +-
 .../component/sjms/SjmsComponentRestartTest.java   |   20 +-
 .../sjms/SjmsDestinationCreationStrategyTest.java  |   92 -
 .../sjms/SjmsEndpointConnectionSettingsTest.java   |   26 -
 .../sjms/SjmsEndpointNameOverrideTest.java         |    1 -
 .../camel/component/sjms/SjmsEndpointTest.java     |   60 +-
 .../sjms/batch/EmbeddedActiveMQBroker.java         |   76 -
 .../batch/SjmsBatchConsumerAsyncStartTest.java     |   51 -
 .../sjms/batch/SjmsBatchConsumerTest.java          |  508 -----
 .../sjms/batch/SjmsBatchEndpointTest.java          |  117 --
 .../sjms/consumer/AsyncConsumerInOutTest.java      |    6 +-
 .../sjms/consumer/InOnlyConsumerAsyncTrueTest.java |   59 -
 .../InOnlyConsumerQueueSynchronousTest.java        |    2 +-
 .../consumer/InOnlyTopicDurableConsumerTest.java   |   41 +-
 .../sjms/consumer/InOutConcurrentConsumerTest.java |    4 +-
 .../sjms/consumer/InOutConsumerQueueAsyncTest.java |   15 +-
 .../sjms/consumer/InOutConsumerQueueTest.java      |    5 +-
 .../consumer/InOutConsumerTempQueueAsyncTest.java  |   14 +-
 .../sjms/consumer/InOutConsumerTopicTest.java      |    2 +-
 .../consumer/InOutSynchronousConsumerTest.java     |    4 +-
 .../camel/component/sjms/it/AsyncJmsInOutIT.java   |    6 +-
 .../component/sjms/it/AsyncJmsInOutTempDestIT.java |    4 +-
 .../component/sjms/it/ConnectionResourceIT.java    |  137 --
 .../camel/component/sjms/it/SyncJmsInOutIT.java    |    4 +-
 .../sjms/jms/ConnectionFactoryResourceTest.java    |  109 -
 .../sjms/manual/ManualBatchFromQueueTest.java      |   79 -
 .../sjms/producer/AsyncQueueProducerTest.java      |    4 +-
 .../sjms/producer/AsyncTopicProducerTest.java      |    2 +-
 .../producer/InOutQueueProducerAsyncLoadTest.java  |   11 +-
 .../producer/InOutQueueProducerSyncLoadTest.java   |   15 +-
 .../sjms/producer/InOutQueueProducerTest.java      |    2 +-
 .../sjms/producer/NoConnectionFactoryTest.java     |  137 --
 .../component/sjms/producer/PrefillPoolTest.java   |   57 -
 .../sjms/producer/QueueProducerQoSTest.java        |    5 +-
 .../component/sjms/producer/QueueProducerTest.java |    6 -
 .../component/sjms/support/JmsTestSupport.java     |    8 +-
 ...chTransactedConcurrentMultipleConsumerTest.java |   52 -
 ...sactedConcurrentMultipleRouteConsumersTest.java |   53 -
 .../sjms/tx/BatchTransactedQueueConsumerTest.java  |   53 -
 ...chTransactedTopicConsumerMultipleRouteTest.java |   53 -
 .../sjms/tx/BatchTransactedTopicConsumerTest.java  |   53 -
 .../sjms/tx/TransactedConcurrentConsumersTest.java |    9 +-
 .../sjms/tx/TransactedConsumerSupport.java         |   10 +-
 .../tx/TransactedConsumersMultipleRouteTest.java   |    9 +-
 .../sjms/tx/TransactedProducerInOutErrorTest.java  |    2 +-
 .../sjms/tx/TransactedQueueConsumerTest.java       |    9 +-
 ....java => TransactedQueueInOutProducerTest.java} |   40 +-
 .../sjms/tx/TransactedQueueProducerTest.java       |   32 +-
 .../sjms/tx/TransactedTopicConsumerTest.java       |    9 +-
 .../sjms/tx/TransactedTopicProducerTest.java       |   41 +-
 components/camel-sjms2/pom.xml                     |   11 +-
 .../component/sjms2/Sjms2EndpointUriFactory.java   |   67 +-
 .../org/apache/camel/component/sjms2/sjms2.json    |   67 +-
 .../camel-sjms2/src/main/docs/sjms2-component.adoc |  513 ++---
 .../camel/component/sjms2/Sjms2Endpoint.java       |   22 +-
 .../component/sjms2/jms/Jms2ObjectFactory.java     |   34 +-
 .../component/sjms2/Sjms2ComponentRestartTest.java |   14 +-
 .../sjms2/Sjms2EndpointConnectionSettingsTest.java |   76 -
 .../sjms2/Sjms2EndpointNameOverrideTest.java       |    1 -
 .../camel/component/sjms2/Sjms2EndpointTest.java   |   68 +-
 .../consumer/InOnlyTopicDurableConsumerTest.java   |   38 +-
 .../consumer/InOnlyTopicSharedConsumerTest.java    |    6 -
 .../sjms2/producer/InOnlyQueueProducerTest.java    |   11 -
 .../component/sjms2/support/Jms2TestSupport.java   |   13 +-
 .../component/ComponentsBuilderFactory.java        |   14 -
 .../component/dsl/JmsComponentBuilderFactory.java  |    2 +-
 .../dsl/Sjms2ComponentBuilderFactory.java          |  224 +--
 .../dsl/SjmsBatchComponentBuilderFactory.java      |  201 --
 .../component/dsl/SjmsComponentBuilderFactory.java |  224 +--
 .../src/generated/resources/metadata.json          |   22 -
 .../endpoint/dsl/JmsEndpointBuilderFactory.java    |    4 +-
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  | 2073 ++++++++++++--------
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   | 1970 ++++++++++++-------
 .../MainConfigurationPropertiesConfigurer.java     |    6 -
 .../camel-main-configuration-metadata.json         |    1 -
 core/camel-main/src/main/docs/main.adoc            |    1 -
 .../camel/main/DefaultConfigurationProperties.java |   26 -
 docs/components/modules/ROOT/nav.adoc              |    1 -
 .../modules/ROOT/pages/jms-component.adoc          |    4 +-
 .../modules/ROOT/pages/sjms-batch-component.adoc   |  209 --
 .../modules/ROOT/pages/sjms-component.adoc         |  362 +---
 .../modules/ROOT/pages/sjms2-component.adoc        |  513 ++---
 .../ROOT/pages/camel-3x-upgrade-guide-3_8.adoc     |   10 +
 168 files changed, 7069 insertions(+), 12351 deletions(-)
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms-batch.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-batch-component.adoc
 delete mode 100644 components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchComponentConfigurer.java
 delete mode 100644 components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointConfigurer.java
 delete mode 100644 components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriFactory.java
 delete mode 100644 components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/component/sjms-batch
 delete mode 100644 components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/configurer/sjms-batch-component
 delete mode 100644 components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/configurer/sjms-batch-endpoint
 delete mode 100644 components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/sjms-batch-endpoint
 delete mode 100644 components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/batch/sjms-batch.json
 delete mode 100644 components/camel-sjms/src/main/docs/sjms-batch-component.adoc
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/AggregatedExceptionListener.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java
 copy components/camel-sjms/src/main/java/org/apache/camel/component/sjms/{SjmsConstants.java => MessageListenerContainer.java} (66%)
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageProducerPool.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageProducerResources.java
 copy components/camel-sjms/src/main/java/org/apache/camel/component/sjms/{tx/DefaultTransactionCommitStrategy.java => ReplyToType.java} (62%)
 copy components/camel-sjms/src/main/java/org/apache/camel/component/sjms/{SjmsConstants.java => SessionCallback.java} (66%)
 copy components/camel-sjms/src/main/java/org/apache/camel/component/sjms/{SjmsConstants.java => SessionMessageListener.java} (79%)
 create mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsHelper.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsLoggingExceptionListener.java
 create mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionCommitStrategy.java
 create mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SessionCompletion.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchComponent.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java
 create mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/EndpointMessageListener.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java
 create mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResource.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionResource.java
 rename components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/{IllegalHeaderException.java => MessageCreator.java} (53%)
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
 create mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/CorrelationTimeoutMap.java
 create mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ExclusiveQueueMessageListenerContainer.java
 create mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/MessageSelectorCreator.java
 rename components/camel-sjms/src/{test/java/org/apache/camel/component/sjms/batch/ListAggregationStrategy.java => main/java/org/apache/camel/component/sjms/reply/QueueReplyHandler.java} (54%)
 create mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/QueueReplyManager.java
 rename components/camel-sjms/src/main/java/org/apache/camel/component/sjms/{tx/DefaultTransactionCommitStrategy.java => reply/ReplyHandler.java} (57%)
 create mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyHolder.java
 create mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManager.java
 create mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManagerSupport.java
 create mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueMessageListenerContainer.java
 create mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyHandler.java
 create mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyManager.java
 copy components/{camel-jms/src/main/java/org/apache/camel/component/jms => camel-sjms/src/main/java/org/apache/camel/component/sjms}/reply/package.html (100%)
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/taskmanager/TimedTaskManager.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionBatchTransactionSynchronization.java
 delete mode 100644 components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/EmbeddedActiveMQBroker.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerAsyncStartTest.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerTest.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointTest.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncTrueTest.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualBatchFromQueueTest.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/NoConnectionFactoryTest.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/PrefillPoolTest.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueConsumerTest.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerMultipleRouteTest.java
 delete mode 100644 components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java
 copy components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/{TransactedQueueProducerTest.java => TransactedQueueInOutProducerTest.java} (80%)
 delete mode 100644 components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointConnectionSettingsTest.java
 delete mode 100644 core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsBatchComponentBuilderFactory.java
 delete mode 100644 docs/components/modules/ROOT/pages/sjms-batch-component.adoc


[camel] 06/07: CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms (producer)

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 8c741e27f70785a0add742fad3ee68ec0ea4689a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 6 12:37:31 2021 +0100

    CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms (producer)
---
 .../apache/camel/catalog/docs/sjms-component.adoc  |  25 +-
 .../apache/camel/catalog/docs/sjms2-component.adoc |  25 +-
 .../component/sjms/SjmsComponentConfigurer.java    |  12 -
 .../component/sjms/SjmsEndpointConfigurer.java     |  48 +-
 .../component/sjms/SjmsEndpointUriFactory.java     |  48 +-
 .../org/apache/camel/component/sjms/sjms.json      |  25 +-
 .../camel-sjms/src/main/docs/sjms-component.adoc   |  25 +-
 .../sjms/AggregatedExceptionListener.java          |  53 --
 .../camel/component/sjms/SessionCallback.java      |  14 +-
 .../apache/camel/component/sjms/SjmsComponent.java |  54 +-
 .../apache/camel/component/sjms/SjmsEndpoint.java  | 233 ++-----
 .../sjms/SjmsLoggingExceptionListener.java         |  46 --
 .../apache/camel/component/sjms/SjmsProducer.java  |  24 +-
 .../apache/camel/component/sjms/SjmsTemplate.java  |  77 ++-
 .../component/sjms/TransactionCommitStrategy.java  |  44 --
 .../component/sjms/TransactionOnCompletion.java    |  18 +-
 .../sjms/consumer/EndpointMessageListener.java     |  87 ++-
 .../consumer/SimpleMessageListenerContainer.java   |   9 +-
 .../component/sjms/jms/Jms11ObjectFactory.java     |  14 +-
 .../camel/component/sjms/jms/JmsBinding.java       |  58 --
 .../ExclusiveQueueMessageListenerContainer.java    |   7 +
 .../component/sjms/reply/QueueReplyManager.java    |  18 +-
 .../camel/component/sjms/reply/ReplyManager.java   |  15 -
 .../component/sjms/reply/ReplyManagerSupport.java  |  24 +-
 .../TemporaryQueueMessageListenerContainer.java    |   7 +
 .../sjms/reply/TemporaryQueueReplyManager.java     |  16 +-
 .../sjms/SjmsEndpointNameOverrideTest.java         |   1 -
 .../camel/component/sjms/SjmsEndpointTest.java     |   1 -
 .../consumer/InOnlyTopicDurableConsumerTest.java   |  11 +-
 .../sjms/consumer/InOutConsumerQueueTest.java      |   3 +-
 .../component/sjms/support/JmsTestSupport.java     |   1 -
 ....java => TransactedQueueInOutProducerTest.java} |  22 +-
 .../sjms/tx/TransactedQueueProducerTest.java       |  14 +-
 .../sjms/tx/TransactedTopicProducerTest.java       |   2 +-
 components/camel-sjms2/pom.xml                     |  11 +-
 .../component/sjms2/Sjms2EndpointUriFactory.java   |  12 +-
 .../org/apache/camel/component/sjms2/sjms2.json    |  25 +-
 .../camel-sjms2/src/main/docs/sjms2-component.adoc |  25 +-
 .../camel/component/sjms2/Sjms2Endpoint.java       |  22 +-
 .../sjms2/Sjms2EndpointNameOverrideTest.java       |   1 -
 .../camel/component/sjms2/Sjms2EndpointTest.java   |   2 -
 .../consumer/InOnlyTopicDurableConsumerTest.java   |  15 +-
 .../component/sjms2/support/Jms2TestSupport.java   |   1 -
 .../dsl/Sjms2ComponentBuilderFactory.java          |  54 +-
 .../component/dsl/SjmsComponentBuilderFactory.java |  54 +-
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  | 716 ++++++---------------
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   | 716 ++++++---------------
 .../modules/ROOT/pages/sjms-component.adoc         |  25 +-
 .../modules/ROOT/pages/sjms2-component.adoc        |  25 +-
 49 files changed, 798 insertions(+), 1987 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc
index eaf6c55..e77b8ff 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc
@@ -79,15 +79,14 @@ You append query options to the URI using the following format,
 == Component Options and Configurations
 
 // component options: START
-The Simple JMS component supports 14 options, which are listed below.
+The Simple JMS component supports 11 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *connectionCount* (common) | The maximum number of connections available to endpoints started under this component | 1 | Integer
-| *connectionFactory* (common) | *Autowired* A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource. |  | ConnectionFactory
+| *connectionFactory* (common) | *Autowired* The connection factory to be use. A connection factory must be configured either on the component or endpoint. |  | ConnectionFactory
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
@@ -98,8 +97,6 @@ The Simple JMS component supports 14 options, which are listed below.
 | *replyToOnTimeoutMaxConcurrent{zwsp}Consumers* (advanced) | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS. | 1 | int
 | *requestTimeoutCheckerInterval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
-| *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
-| *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 |===
 // component options: END
 
@@ -124,21 +121,23 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (48 parameters):
+=== Query Parameters (44 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *acknowledgementMode* (common) | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. There are 4 enums and the value can be one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | SessionAcknowledgementType
+| *connectionFactory* (common) | The connection factory to be use. A connection factory must be configured either on the component or endpoint. |  | ConnectionFactory
 | *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message broker [...]
 | *replyTo* (common) | Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer). |  | String
 | *testConnectionOnStartup* (common) | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | boolean
 | *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100% strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transac [...]
 | *autoStartup* (consumer) | Specifies whether the consumer container should auto-startup. | true | boolean
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
+| *clientId* (consumer) | Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics instead. |  | String
 | *concurrentConsumers* (consumer) | Specifies the default number of concurrent consumers when consuming from JMS (not for request/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. When doing request/reply over JMS then the option replyToConcurrentConsumers is used to control number of concurrent consumers on the reply message listener. | 1 | int
-| *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
+| *durableSubscriptionName* (consumer) | The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configured as well. |  | String
 | *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
 | *eagerLoadingOfProperties* (consumer) | Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes can catch early any issues with the underlying JMS provider and the use of JMS properties. See also the option eagerPoisonBody. | false | boolean
 | *eagerPoisonBody* (consumer) | If eagerLoadingOfProperties is enabled and the JMS message payload (JMS body or JMS properties) is poison (cannot be read/mapped), then set this text as the message body instead so the message can be processed (the cause of the poison are already stored as exception on the Exchange). This can be turned off by setting eagerPoisonBody=false. See also the option eagerLoadingOfProperties. | Poison JMS message due to ${exception.message} | String
@@ -148,22 +147,19 @@ with the following path and query parameters:
 | *replyToSameDestinationAllowed* (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
 | *deliveryMode* (producer) | Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2. There are 2 enums and the value can be one of: 1, 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
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
 | *replyToConcurrentConsumers* (producer) | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. | 1 | int
 | *replyToOverride* (producer) | Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination. |  | String
-| *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  [...]
+| *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 or Exclusive. By default Camel will use temporary queues. However if replyTo has been configured, then Exclusive is used. There are 2 enums and the value can be one of: Temporary, 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
 | *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
 | *disableTimeToLive* (producer) | Use this option to force disabling time to live. For example when you do request/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message being sent. The problem is that the sender and receiver systems have to have their clocks synchronized, so they are in sync. This is not always so easy to archive. So you can use disableTimeToLive=true to not set a time to live value on the sent message. Then the message w [...]
-| *includeSentJMSMessageID* (producer) | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination. | false | 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
+| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
-| *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
-| *connectionFactory* (advanced) | Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any |  | ConnectionFactory
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *exceptionListener* (advanced) | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. |  | ExceptionListener
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
@@ -174,10 +170,7 @@ with the following path and query parameters:
 | *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
-| *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
-| *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
-| *sharedJMSSession* (transaction) | Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS providers, use jms component to leverage XA transaction. | true | boolean
 |===
 // endpoint options: END
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms2-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms2-component.adoc
index a638296..d589102 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms2-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms2-component.adoc
@@ -79,15 +79,14 @@ You append query options to the URI using the following format,
 == Component Options and Configurations
 
 // component options: START
-The Simple JMS2 component supports 14 options, which are listed below.
+The Simple JMS2 component supports 11 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *connectionCount* (common) | The maximum number of connections available to endpoints started under this component | 1 | Integer
-| *connectionFactory* (common) | *Autowired* A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource. |  | ConnectionFactory
+| *connectionFactory* (common) | *Autowired* The connection factory to be use. A connection factory must be configured either on the component or endpoint. |  | ConnectionFactory
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
@@ -98,8 +97,6 @@ The Simple JMS2 component supports 14 options, which are listed below.
 | *replyToOnTimeoutMaxConcurrent{zwsp}Consumers* (advanced) | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS. | 1 | int
 | *requestTimeoutCheckerInterval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
-| *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
-| *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 |===
 // component options: END
 
@@ -124,22 +121,24 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (51 parameters):
+=== Query Parameters (47 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *acknowledgementMode* (common) | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. There are 4 enums and the value can be one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | SessionAcknowledgementType
+| *connectionFactory* (common) | The connection factory to be use. A connection factory must be configured either on the component or endpoint. |  | ConnectionFactory
 | *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message broker [...]
 | *replyTo* (common) | Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer). |  | String
 | *testConnectionOnStartup* (common) | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | boolean
 | *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100% strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transac [...]
 | *autoStartup* (consumer) | Specifies whether the consumer container should auto-startup. | true | boolean
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
+| *clientId* (consumer) | Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics instead. |  | String
 | *concurrentConsumers* (consumer) | Specifies the default number of concurrent consumers when consuming from JMS (not for request/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. When doing request/reply over JMS then the option replyToConcurrentConsumers is used to control number of concurrent consumers on the reply message listener. | 1 | int
 | *durable* (consumer) | Sets topic consumer to durable. | false | boolean
-| *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
+| *durableSubscriptionName* (consumer) | The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configured as well. |  | String
 | *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
 | *shared* (consumer) | Sets the consumer to shared. | false | boolean
 | *subscriptionId* (consumer) | Sets the subscription Id, required for durable or shared topics. |  | String
@@ -151,22 +150,19 @@ with the following path and query parameters:
 | *replyToSameDestinationAllowed* (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
 | *deliveryMode* (producer) | Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2. There are 2 enums and the value can be one of: 1, 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
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
 | *replyToConcurrentConsumers* (producer) | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. | 1 | int
 | *replyToOverride* (producer) | Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination. |  | String
-| *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  [...]
+| *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 or Exclusive. By default Camel will use temporary queues. However if replyTo has been configured, then Exclusive is used. There are 2 enums and the value can be one of: Temporary, 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
 | *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
 | *disableTimeToLive* (producer) | Use this option to force disabling time to live. For example when you do request/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message being sent. The problem is that the sender and receiver systems have to have their clocks synchronized, so they are in sync. This is not always so easy to archive. So you can use disableTimeToLive=true to not set a time to live value on the sent message. Then the message w [...]
-| *includeSentJMSMessageID* (producer) | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination. | false | 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
+| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
-| *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
-| *connectionFactory* (advanced) | Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any |  | ConnectionFactory
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *exceptionListener* (advanced) | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. |  | ExceptionListener
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
@@ -177,10 +173,7 @@ with the following path and query parameters:
 | *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
-| *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
-| *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
-| *sharedJMSSession* (transaction) | Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS providers, use jms component to leverage XA transaction. | true | boolean
 |===
 // endpoint options: END
 
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java
index 566e482..ba8c379 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java
@@ -25,8 +25,6 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
-        case "connectioncount":
-        case "connectionCount": target.setConnectionCount(property(camelContext, java.lang.Integer.class, value)); return true;
         case "connectionfactory":
         case "connectionFactory": target.setConnectionFactory(property(camelContext, javax.jms.ConnectionFactory.class, value)); return true;
         case "destinationcreationstrategy":
@@ -39,14 +37,12 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
         case "messagecreatedstrategy":
         case "messageCreatedStrategy": target.setMessageCreatedStrategy(property(camelContext, org.apache.camel.component.sjms.jms.MessageCreatedStrategy.class, value)); return true;
-        case "password": target.setPassword(property(camelContext, java.lang.String.class, value)); return true;
         case "recoveryinterval":
         case "recoveryInterval": target.setRecoveryInterval(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
         case "replytoontimeoutmaxconcurrentconsumers":
         case "replyToOnTimeoutMaxConcurrentConsumers": target.setReplyToOnTimeoutMaxConcurrentConsumers(property(camelContext, int.class, value)); return true;
         case "requesttimeoutcheckerinterval":
         case "requestTimeoutCheckerInterval": target.setRequestTimeoutCheckerInterval(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
-        case "username": target.setUsername(property(camelContext, java.lang.String.class, value)); return true;
         default: return false;
         }
     }
@@ -63,8 +59,6 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "autowiredEnabled": return boolean.class;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return boolean.class;
-        case "connectioncount":
-        case "connectionCount": return java.lang.Integer.class;
         case "connectionfactory":
         case "connectionFactory": return javax.jms.ConnectionFactory.class;
         case "destinationcreationstrategy":
@@ -77,14 +71,12 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "lazyStartProducer": return boolean.class;
         case "messagecreatedstrategy":
         case "messageCreatedStrategy": return org.apache.camel.component.sjms.jms.MessageCreatedStrategy.class;
-        case "password": return java.lang.String.class;
         case "recoveryinterval":
         case "recoveryInterval": return long.class;
         case "replytoontimeoutmaxconcurrentconsumers":
         case "replyToOnTimeoutMaxConcurrentConsumers": return int.class;
         case "requesttimeoutcheckerinterval":
         case "requestTimeoutCheckerInterval": return long.class;
-        case "username": return java.lang.String.class;
         default: return null;
         }
     }
@@ -97,8 +89,6 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "autowiredEnabled": return target.isAutowiredEnabled();
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return target.isBridgeErrorHandler();
-        case "connectioncount":
-        case "connectionCount": return target.getConnectionCount();
         case "connectionfactory":
         case "connectionFactory": return target.getConnectionFactory();
         case "destinationcreationstrategy":
@@ -111,14 +101,12 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "lazyStartProducer": return target.isLazyStartProducer();
         case "messagecreatedstrategy":
         case "messageCreatedStrategy": return target.getMessageCreatedStrategy();
-        case "password": return target.getPassword();
         case "recoveryinterval":
         case "recoveryInterval": return target.getRecoveryInterval();
         case "replytoontimeoutmaxconcurrentconsumers":
         case "replyToOnTimeoutMaxConcurrentConsumers": return target.getReplyToOnTimeoutMaxConcurrentConsumers();
         case "requesttimeoutcheckerinterval":
         case "requestTimeoutCheckerInterval": return target.getRequestTimeoutCheckerInterval();
-        case "username": return target.getUsername();
         default: return null;
         }
     }
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java
index 9487e58..3b55532 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java
@@ -35,10 +35,10 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "autoStartup": target.setAutoStartup(property(camelContext, boolean.class, value)); return true;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
+        case "clientid":
+        case "clientId": target.setClientId(property(camelContext, java.lang.String.class, value)); return true;
         case "concurrentconsumers":
         case "concurrentConsumers": target.setConcurrentConsumers(property(camelContext, int.class, value)); return true;
-        case "connectioncount":
-        case "connectionCount": target.setConnectionCount(property(camelContext, java.lang.Integer.class, value)); return true;
         case "connectionfactory":
         case "connectionFactory": target.setConnectionFactory(property(camelContext, javax.jms.ConnectionFactory.class, value)); return true;
         case "deliverymode":
@@ -51,16 +51,12 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "disableReplyTo": target.setDisableReplyTo(property(camelContext, boolean.class, value)); return true;
         case "disabletimetolive":
         case "disableTimeToLive": target.setDisableTimeToLive(property(camelContext, boolean.class, value)); return true;
-        case "durablesubscriptionid":
-        case "durableSubscriptionId": target.setDurableSubscriptionId(property(camelContext, java.lang.String.class, value)); return true;
+        case "durablesubscriptionname":
+        case "durableSubscriptionName": target.setDurableSubscriptionName(property(camelContext, java.lang.String.class, value)); return true;
         case "eagerloadingofproperties":
         case "eagerLoadingOfProperties": target.setEagerLoadingOfProperties(property(camelContext, boolean.class, value)); return true;
         case "eagerpoisonbody":
         case "eagerPoisonBody": target.setEagerPoisonBody(property(camelContext, java.lang.String.class, value)); return true;
-        case "errorhandlerlogstacktrace":
-        case "errorHandlerLogStackTrace": target.setErrorHandlerLogStackTrace(property(camelContext, boolean.class, value)); return true;
-        case "errorhandlerlogginglevel":
-        case "errorHandlerLoggingLevel": target.setErrorHandlerLoggingLevel(property(camelContext, org.apache.camel.LoggingLevel.class, value)); return true;
         case "exceptionhandler":
         case "exceptionHandler": target.setExceptionHandler(property(camelContext, org.apache.camel.spi.ExceptionHandler.class, value)); return true;
         case "exceptionlistener":
@@ -73,8 +69,6 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "headerFilterStrategy": target.setHeaderFilterStrategy(property(camelContext, org.apache.camel.spi.HeaderFilterStrategy.class, value)); return true;
         case "includealljmsxproperties":
         case "includeAllJMSXProperties": target.setIncludeAllJMSXProperties(property(camelContext, boolean.class, value)); return true;
-        case "includesentjmsmessageid":
-        case "includeSentJMSMessageID": target.setIncludeSentJMSMessageID(property(camelContext, boolean.class, value)); return true;
         case "jmskeyformatstrategy":
         case "jmsKeyFormatStrategy": target.setJmsKeyFormatStrategy(property(camelContext, org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy.class, value)); return true;
         case "lazystartproducer":
@@ -104,8 +98,6 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "replyToType": target.setReplyToType(property(camelContext, org.apache.camel.component.sjms.ReplyToType.class, value)); return true;
         case "requesttimeout":
         case "requestTimeout": target.setRequestTimeout(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
-        case "sharedjmssession":
-        case "sharedJMSSession": target.setSharedJMSSession(property(camelContext, boolean.class, value)); return true;
         case "synchronous": target.setSynchronous(property(camelContext, boolean.class, value)); return true;
         case "testconnectiononstartup":
         case "testConnectionOnStartup": target.setTestConnectionOnStartup(property(camelContext, boolean.class, value)); return true;
@@ -135,10 +127,10 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "autoStartup": return boolean.class;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return boolean.class;
+        case "clientid":
+        case "clientId": return java.lang.String.class;
         case "concurrentconsumers":
         case "concurrentConsumers": return int.class;
-        case "connectioncount":
-        case "connectionCount": return java.lang.Integer.class;
         case "connectionfactory":
         case "connectionFactory": return javax.jms.ConnectionFactory.class;
         case "deliverymode":
@@ -151,16 +143,12 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "disableReplyTo": return boolean.class;
         case "disabletimetolive":
         case "disableTimeToLive": return boolean.class;
-        case "durablesubscriptionid":
-        case "durableSubscriptionId": return java.lang.String.class;
+        case "durablesubscriptionname":
+        case "durableSubscriptionName": return java.lang.String.class;
         case "eagerloadingofproperties":
         case "eagerLoadingOfProperties": return boolean.class;
         case "eagerpoisonbody":
         case "eagerPoisonBody": return java.lang.String.class;
-        case "errorhandlerlogstacktrace":
-        case "errorHandlerLogStackTrace": return boolean.class;
-        case "errorhandlerlogginglevel":
-        case "errorHandlerLoggingLevel": return org.apache.camel.LoggingLevel.class;
         case "exceptionhandler":
         case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
         case "exceptionlistener":
@@ -173,8 +161,6 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "headerFilterStrategy": return org.apache.camel.spi.HeaderFilterStrategy.class;
         case "includealljmsxproperties":
         case "includeAllJMSXProperties": return boolean.class;
-        case "includesentjmsmessageid":
-        case "includeSentJMSMessageID": return boolean.class;
         case "jmskeyformatstrategy":
         case "jmsKeyFormatStrategy": return org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy.class;
         case "lazystartproducer":
@@ -204,8 +190,6 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "replyToType": return org.apache.camel.component.sjms.ReplyToType.class;
         case "requesttimeout":
         case "requestTimeout": return long.class;
-        case "sharedjmssession":
-        case "sharedJMSSession": return boolean.class;
         case "synchronous": return boolean.class;
         case "testconnectiononstartup":
         case "testConnectionOnStartup": return boolean.class;
@@ -236,10 +220,10 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "autoStartup": return target.isAutoStartup();
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return target.isBridgeErrorHandler();
+        case "clientid":
+        case "clientId": return target.getClientId();
         case "concurrentconsumers":
         case "concurrentConsumers": return target.getConcurrentConsumers();
-        case "connectioncount":
-        case "connectionCount": return target.getConnectionCount();
         case "connectionfactory":
         case "connectionFactory": return target.getConnectionFactory();
         case "deliverymode":
@@ -252,16 +236,12 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "disableReplyTo": return target.isDisableReplyTo();
         case "disabletimetolive":
         case "disableTimeToLive": return target.isDisableTimeToLive();
-        case "durablesubscriptionid":
-        case "durableSubscriptionId": return target.getDurableSubscriptionId();
+        case "durablesubscriptionname":
+        case "durableSubscriptionName": return target.getDurableSubscriptionName();
         case "eagerloadingofproperties":
         case "eagerLoadingOfProperties": return target.isEagerLoadingOfProperties();
         case "eagerpoisonbody":
         case "eagerPoisonBody": return target.getEagerPoisonBody();
-        case "errorhandlerlogstacktrace":
-        case "errorHandlerLogStackTrace": return target.isErrorHandlerLogStackTrace();
-        case "errorhandlerlogginglevel":
-        case "errorHandlerLoggingLevel": return target.getErrorHandlerLoggingLevel();
         case "exceptionhandler":
         case "exceptionHandler": return target.getExceptionHandler();
         case "exceptionlistener":
@@ -274,8 +254,6 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "headerFilterStrategy": return target.getHeaderFilterStrategy();
         case "includealljmsxproperties":
         case "includeAllJMSXProperties": return target.isIncludeAllJMSXProperties();
-        case "includesentjmsmessageid":
-        case "includeSentJMSMessageID": return target.isIncludeSentJMSMessageID();
         case "jmskeyformatstrategy":
         case "jmsKeyFormatStrategy": return target.getJmsKeyFormatStrategy();
         case "lazystartproducer":
@@ -305,8 +283,6 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "replyToType": return target.getReplyToType();
         case "requesttimeout":
         case "requestTimeout": return target.getRequestTimeout();
-        case "sharedjmssession":
-        case "sharedJMSSession": return target.isSharedJMSSession();
         case "synchronous": return target.isSynchronous();
         case "testconnectiononstartup":
         case "testConnectionOnStartup": return target.isTestConnectionOnStartup();
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java
index 717a7ff..8cda40d 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java
@@ -20,57 +20,53 @@ public class SjmsEndpointUriFactory extends org.apache.camel.support.component.E
     private static final Set<String> PROPERTY_NAMES;
     private static final Set<String> SECRET_PROPERTY_NAMES;
     static {
-        Set<String> props = new HashSet<>(50);
-        props.add("includeSentJMSMessageID");
+        Set<String> props = new HashSet<>(46);
         props.add("asyncConsumer");
         props.add("mapJmsMessage");
         props.add("synchronous");
         props.add("includeAllJMSXProperties");
-        props.add("errorHandlerLogStackTrace");
+        props.add("explicitQosEnabled");
+        props.add("transacted");
         props.add("eagerLoadingOfProperties");
+        props.add("autoStartup");
         props.add("timeToLive");
         props.add("bridgeErrorHandler");
+        props.add("jmsKeyFormatStrategy");
         props.add("deliveryMode");
+        props.add("headerFilterStrategy");
         props.add("transferException");
         props.add("exceptionListener");
+        props.add("destinationName");
+        props.add("messageCreatedStrategy");
+        props.add("asyncStopListener");
         props.add("destinationType");
         props.add("asyncStartListener");
         props.add("eagerPoisonBody");
+        props.add("requestTimeout");
+        props.add("allowNullBody");
+        props.add("replyToDeliveryPersistent");
+        props.add("disableReplyTo");
         props.add("replyToConcurrentConsumers");
+        props.add("clientId");
+        props.add("recoveryInterval");
         props.add("destinationCreationStrategy");
+        props.add("exchangePattern");
         props.add("disableTimeToLive");
         props.add("messageSelector");
         props.add("deliveryPersistent");
         props.add("priority");
+        props.add("preserveMessageQos");
         props.add("concurrentConsumers");
         props.add("acknowledgementMode");
+        props.add("replyToType");
         props.add("lazyStartProducer");
+        props.add("connectionFactory");
+        props.add("testConnectionOnStartup");
         props.add("replyTo");
         props.add("replyToOverride");
-        props.add("errorHandlerLoggingLevel");
-        props.add("durableSubscriptionId");
-        props.add("exceptionHandler");
-        props.add("connectionCount");
-        props.add("explicitQosEnabled");
-        props.add("transacted");
-        props.add("autoStartup");
-        props.add("jmsKeyFormatStrategy");
-        props.add("headerFilterStrategy");
-        props.add("destinationName");
-        props.add("messageCreatedStrategy");
-        props.add("asyncStopListener");
-        props.add("requestTimeout");
-        props.add("allowNullBody");
-        props.add("replyToDeliveryPersistent");
-        props.add("disableReplyTo");
-        props.add("recoveryInterval");
-        props.add("exchangePattern");
-        props.add("preserveMessageQos");
-        props.add("replyToType");
-        props.add("testConnectionOnStartup");
-        props.add("connectionFactory");
+        props.add("durableSubscriptionName");
         props.add("replyToSameDestinationAllowed");
-        props.add("sharedJMSSession");
+        props.add("exceptionHandler");
         PROPERTY_NAMES = Collections.unmodifiableSet(props);
         SECRET_PROPERTY_NAMES = Collections.emptySet();
     }
diff --git a/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json b/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json
index 9e065f0..480464c 100644
--- a/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json
+++ b/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json
@@ -22,8 +22,7 @@
     "lenientProperties": false
   },
   "componentProperties": {
-    "connectionCount": { "kind": "property", "displayName": "Connection Count", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "description": "The maximum number of connections available to endpoints started under this component" },
-    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": true, "secret": false, "description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource." },
+    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": true, "secret": false, "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
     "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
     "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
@@ -33,22 +32,22 @@
     "recoveryInterval": { "kind": "property", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
     "replyToOnTimeoutMaxConcurrentConsumers": { "kind": "property", "displayName": "Reply To On Timeout Max Concurrent Consumers", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request\/reply over JMS." },
     "requestTimeoutCheckerInterval": { "kind": "property", "displayName": "Request Timeout Checker Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Configures how often Camel should check for timed out Exchanges when doing request\/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeou [...]
-    "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
-    "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
-    "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }
+    "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." }
   },
   "properties": {
     "destinationType": { "kind": "path", "displayName": "Destination Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "queue", "topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "queue", "description": "The kind of destination to use" },
     "destinationName": { "kind": "path", "displayName": "Destination Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "DestinationName is a JMS queue or topic name. By default, the destinationName is interpreted as a queue name." },
     "acknowledgementMode": { "kind": "parameter", "displayName": "Acknowledgement Mode", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.SessionAcknowledgementType", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "description": "The JMS acknowledgement name, which is one of:  [...]
+    "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
     "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from  [...]
     "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
     "testConnectionOnStartup": { "kind": "parameter", "displayName": "Test Connection On Startup", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel [...]
     "asyncConsumer": { "kind": "parameter", "displayName": "Async Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asy [...]
     "autoStartup": { "kind": "parameter", "displayName": "Auto Startup", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether the consumer container should auto-startup." },
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
+    "clientId": { "kind": "parameter", "displayName": "Client Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may pref [...]
     "concurrentConsumers": { "kind": "parameter", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the default number of concurrent consumers when consuming from JMS (not for request\/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up\/down of threads. When doing r [...]
-    "durableSubscriptionId": { "kind": "parameter", "displayName": "Durable Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the durable subscription Id required for durable topics." },
+    "durableSubscriptionName": { "kind": "parameter", "displayName": "Durable Subscription Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configured as well." },
     "replyToDeliveryPersistent": { "kind": "parameter", "displayName": "Reply To Delivery Persistent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to use persistent delivery by default for replies." },
     "eagerLoadingOfProperties": { "kind": "parameter", "displayName": "Eager Loading Of Properties", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes c [...]
     "eagerPoisonBody": { "kind": "parameter", "displayName": "Eager Poison Body", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Poison JMS message due to ${exception.message}", "description": "If eagerLoadingOfProperties is enabled and the JMS message payload (JMS body or JMS properties) is poison (cannot be read\/mapped), then se [...]
@@ -58,22 +57,19 @@
     "replyToSameDestinationAllowed": { "kind": "parameter", "displayName": "Reply To Same Destination Allowed", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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 c [...]
     "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2." },
     "deliveryPersistent": { "kind": "parameter", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether persistent delivery is used by default." },
-    "explicitQosEnabled": { "kind": "parameter", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "description": "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 timeToLi [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
-    "preserveMessageQos": { "kind": "parameter", "displayName": "Preserve Message Qos", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDelive [...]
     "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "description": "Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in orde [...]
     "replyToConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the default number of concurrent consumers when doing request\/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up\/down of threads." },
     "replyToOverride": { "kind": "parameter", "displayName": "Reply To Override", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination." },
-    "replyToType": { "kind": "parameter", "displayName": "Reply To Type", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.ReplyToType", "enum": [ "Temporary", "Exclusive" ], "deprecated": false, "autowired": false, "secret": false, "description": "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 Exclusi [...]
+    "replyToType": { "kind": "parameter", "displayName": "Reply To Type", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.ReplyToType", "enum": [ "Temporary", "Exclusive" ], "deprecated": false, "autowired": false, "secret": false, "description": "Allows for explicitly specifying which kind of strategy to use for replyTo queues when doing request\/reply over JMS. Possible values are: Temporary or Exclusive. By de [...]
     "requestTimeout": { "kind": "parameter", "displayName": "Request Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "20000", "description": "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 timeou [...]
     "timeToLive": { "kind": "parameter", "displayName": "Time To Live", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "description": "When sending messages, specifies the time-to-live of the message (in milliseconds)." },
     "allowNullBody": { "kind": "parameter", "displayName": "Allow Null Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an JMSException is thrown." },
     "disableTimeToLive": { "kind": "parameter", "displayName": "Disable Time To Live", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Use this option to force disabling time to live. For example when you do request\/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message  [...]
-    "includeSentJMSMessageID": { "kind": "parameter", "displayName": "Include Sent JMSMessage ID", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was  [...]
+    "explicitQosEnabled": { "kind": "parameter", "displayName": "Explicit Qos Enabled", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "description": "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, p [...]
+    "preserveMessageQos": { "kind": "parameter", "displayName": "Preserve Message Qos", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JM [...]
     "asyncStartListener": { "kind": "parameter", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/o [...]
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to stop the consumer message listener asynchronously, when stopping a route." },
-    "connectionCount": { "kind": "parameter", "displayName": "Connection Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "description": "The maximum number of connections available to this endpoint" },
-    "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any" },
     "destinationCreationStrategy": { "kind": "parameter", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
     "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
@@ -84,9 +80,6 @@
     "recoveryInterval": { "kind": "parameter", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
     "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client i [...]
-    "errorHandlerLoggingLevel": { "kind": "parameter", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "description": "Allows to configure the default errorHandler logging level for logging uncaught exceptions." },
-    "errorHandlerLogStackTrace": { "kind": "parameter", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Allows to control whether stacktraces should be logged or not, by the default errorHandler." },
-    "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to use transacted mode" },
-    "sharedJMSSession": { "kind": "parameter", "displayName": "Shared JMSSession", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS provi [...]
+    "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to use transacted mode" }
   }
 }
diff --git a/components/camel-sjms/src/main/docs/sjms-component.adoc b/components/camel-sjms/src/main/docs/sjms-component.adoc
index eaf6c55..e77b8ff 100644
--- a/components/camel-sjms/src/main/docs/sjms-component.adoc
+++ b/components/camel-sjms/src/main/docs/sjms-component.adoc
@@ -79,15 +79,14 @@ You append query options to the URI using the following format,
 == Component Options and Configurations
 
 // component options: START
-The Simple JMS component supports 14 options, which are listed below.
+The Simple JMS component supports 11 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *connectionCount* (common) | The maximum number of connections available to endpoints started under this component | 1 | Integer
-| *connectionFactory* (common) | *Autowired* A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource. |  | ConnectionFactory
+| *connectionFactory* (common) | *Autowired* The connection factory to be use. A connection factory must be configured either on the component or endpoint. |  | ConnectionFactory
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
@@ -98,8 +97,6 @@ The Simple JMS component supports 14 options, which are listed below.
 | *replyToOnTimeoutMaxConcurrent{zwsp}Consumers* (advanced) | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS. | 1 | int
 | *requestTimeoutCheckerInterval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
-| *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
-| *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 |===
 // component options: END
 
@@ -124,21 +121,23 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (48 parameters):
+=== Query Parameters (44 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *acknowledgementMode* (common) | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. There are 4 enums and the value can be one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | SessionAcknowledgementType
+| *connectionFactory* (common) | The connection factory to be use. A connection factory must be configured either on the component or endpoint. |  | ConnectionFactory
 | *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message broker [...]
 | *replyTo* (common) | Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer). |  | String
 | *testConnectionOnStartup* (common) | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | boolean
 | *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100% strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transac [...]
 | *autoStartup* (consumer) | Specifies whether the consumer container should auto-startup. | true | boolean
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
+| *clientId* (consumer) | Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics instead. |  | String
 | *concurrentConsumers* (consumer) | Specifies the default number of concurrent consumers when consuming from JMS (not for request/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. When doing request/reply over JMS then the option replyToConcurrentConsumers is used to control number of concurrent consumers on the reply message listener. | 1 | int
-| *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
+| *durableSubscriptionName* (consumer) | The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configured as well. |  | String
 | *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
 | *eagerLoadingOfProperties* (consumer) | Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes can catch early any issues with the underlying JMS provider and the use of JMS properties. See also the option eagerPoisonBody. | false | boolean
 | *eagerPoisonBody* (consumer) | If eagerLoadingOfProperties is enabled and the JMS message payload (JMS body or JMS properties) is poison (cannot be read/mapped), then set this text as the message body instead so the message can be processed (the cause of the poison are already stored as exception on the Exchange). This can be turned off by setting eagerPoisonBody=false. See also the option eagerLoadingOfProperties. | Poison JMS message due to ${exception.message} | String
@@ -148,22 +147,19 @@ with the following path and query parameters:
 | *replyToSameDestinationAllowed* (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
 | *deliveryMode* (producer) | Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2. There are 2 enums and the value can be one of: 1, 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
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
 | *replyToConcurrentConsumers* (producer) | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. | 1 | int
 | *replyToOverride* (producer) | Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination. |  | String
-| *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  [...]
+| *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 or Exclusive. By default Camel will use temporary queues. However if replyTo has been configured, then Exclusive is used. There are 2 enums and the value can be one of: Temporary, 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
 | *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
 | *disableTimeToLive* (producer) | Use this option to force disabling time to live. For example when you do request/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message being sent. The problem is that the sender and receiver systems have to have their clocks synchronized, so they are in sync. This is not always so easy to archive. So you can use disableTimeToLive=true to not set a time to live value on the sent message. Then the message w [...]
-| *includeSentJMSMessageID* (producer) | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination. | false | 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
+| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
-| *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
-| *connectionFactory* (advanced) | Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any |  | ConnectionFactory
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *exceptionListener* (advanced) | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. |  | ExceptionListener
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
@@ -174,10 +170,7 @@ with the following path and query parameters:
 | *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
-| *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
-| *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
-| *sharedJMSSession* (transaction) | Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS providers, use jms component to leverage XA transaction. | true | boolean
 |===
 // endpoint options: END
 
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/AggregatedExceptionListener.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/AggregatedExceptionListener.java
deleted file mode 100644
index bed3bc5..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/AggregatedExceptionListener.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AggregatedExceptionListener implements ExceptionListener {
-    private static final Logger LOG = LoggerFactory.getLogger(AggregatedExceptionListener.class);
-    private final Set<ExceptionListener> listenerSet;
-
-    public AggregatedExceptionListener(ExceptionListener... exceptionListeners) {
-        this.listenerSet = new HashSet<>(exceptionListeners.length);
-        for (ExceptionListener exceptionListener : exceptionListeners) {
-            if (exceptionListener instanceof AggregatedExceptionListener) {
-                listenerSet.addAll(((AggregatedExceptionListener) exceptionListener).listenerSet); //prevent multiwrapping
-            } else {
-                listenerSet.add(exceptionListener);
-            }
-        }
-    }
-
-    @Override
-    public void onException(JMSException exception) {
-        for (ExceptionListener listener : listenerSet) {
-            try {
-                listener.onException(exception);
-            } catch (Exception ex) {
-                LOG.error("Exception listeners shouldn't throw exceptions", ex);
-            }
-        }
-    }
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SessionCallback.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SessionCallback.java
index 8d9e23d..e2237b9 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SessionCallback.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SessionCallback.java
@@ -16,10 +16,18 @@
  */
 package org.apache.camel.component.sjms;
 
+import javax.jms.Connection;
 import javax.jms.Session;
 
-@FunctionalInterface
-public interface SessionCallback<T> {
+import static org.apache.camel.component.sjms.SjmsHelper.closeConnection;
+import static org.apache.camel.component.sjms.SjmsHelper.closeSession;
 
-    T doInJms(Session session) throws Exception;
+public interface SessionCallback {
+
+    void doInJms(Session session) throws Exception;
+
+    default void onClose(Connection connection, Session session) {
+        closeSession(session);
+        closeConnection(connection);
+    }
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
index e63a069..c5b32b9 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
@@ -24,6 +24,7 @@ import javax.jms.ConnectionFactory;
 import org.apache.camel.CamelException;
 import org.apache.camel.Endpoint;
 import org.apache.camel.ExchangePattern;
+import org.apache.camel.component.sjms.jms.DefaultDestinationCreationStrategy;
 import org.apache.camel.component.sjms.jms.DefaultJmsKeyFormatStrategy;
 import org.apache.camel.component.sjms.jms.DestinationCreationStrategy;
 import org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy;
@@ -39,14 +40,8 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
     private ExecutorService asyncStartStopExecutorService;
 
     @Metadata(label = "common", autowired = true,
-              description = "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.")
+              description = "The connection factory to be use. A connection factory must be configured either on the component or endpoint.")
     private ConnectionFactory connectionFactory;
-    @Metadata(label = "security", secret = true,
-              description = "Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory.")
-    private String username;
-    @Metadata(label = "security", secret = true,
-              description = "Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory.")
-    private String password;
     @UriParam(description = "Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance."
                             + " It is typically only required for durable topic subscriptions."
                             + " If using Apache ActiveMQ you may prefer to use Virtual Topics instead.")
@@ -57,11 +52,8 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
                             + " 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.")
     private JmsKeyFormatStrategy jmsKeyFormatStrategy = new DefaultJmsKeyFormatStrategy();
-    @Metadata(defaultValue = "1",
-              description = "The maximum number of connections available to endpoints started under this component")
-    private Integer connectionCount = 1;
     @Metadata(label = "advanced", description = "To use a custom DestinationCreationStrategy.")
-    private DestinationCreationStrategy destinationCreationStrategy;
+    private DestinationCreationStrategy destinationCreationStrategy = new DefaultDestinationCreationStrategy();
     @Metadata(label = "advanced",
               description = "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.")
@@ -88,20 +80,16 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
     @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         validateMepAndReplyTo(parameters);
+
         SjmsEndpoint endpoint = createSjmsEndpoint(uri, remaining);
-        if (endpoint.isTransacted()) {
-            endpoint.setSynchronous(true);
-        }
-        if (destinationCreationStrategy != null) {
-            endpoint.setDestinationCreationStrategy(destinationCreationStrategy);
-        }
+        endpoint.setConnectionFactory(connectionFactory);
+        endpoint.setDestinationCreationStrategy(destinationCreationStrategy);
+        endpoint.setRecoveryInterval(recoveryInterval);
+        endpoint.setMessageCreatedStrategy(messageCreatedStrategy);
+        endpoint.setClientId(clientId);
         if (getHeaderFilterStrategy() != null) {
             endpoint.setHeaderFilterStrategy(getHeaderFilterStrategy());
         }
-        if (messageCreatedStrategy != null) {
-            endpoint.setMessageCreatedStrategy(messageCreatedStrategy);
-        }
-        endpoint.setRecoveryInterval(recoveryInterval);
         setProperties(endpoint, parameters);
         return endpoint;
     }
@@ -158,14 +146,6 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
         return connectionFactory;
     }
 
-    public void setConnectionCount(Integer maxConnections) {
-        this.connectionCount = maxConnections;
-    }
-
-    public Integer getConnectionCount() {
-        return connectionCount;
-    }
-
     public void setJmsKeyFormatStrategy(JmsKeyFormatStrategy jmsKeyFormatStrategy) {
         this.jmsKeyFormatStrategy = jmsKeyFormatStrategy;
     }
@@ -190,22 +170,6 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
         this.messageCreatedStrategy = messageCreatedStrategy;
     }
 
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
     public String getClientId() {
         return clientId;
     }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
index 5c146a3..d2dd971 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
@@ -30,7 +30,6 @@ import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.MultipleConsumersSupport;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -54,7 +53,6 @@ import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
 import org.apache.camel.support.DefaultEndpoint;
-import org.apache.camel.support.EndpointHelper;
 import org.apache.camel.support.SynchronousDelegateProducer;
 import org.apache.camel.util.StringHelper;
 
@@ -86,20 +84,13 @@ public class SjmsEndpoint extends DefaultEndpoint
     @UriParam(label = "transaction",
               description = "Specifies whether to use transacted mode")
     private boolean transacted;
-    @UriParam(label = "transaction,advanced", defaultValue = "true",
-              description = "Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers."
-                            + " If you need transaction against multiple JMS providers, use jms component to leverage XA transaction.")
-    private boolean sharedJMSSession = true;
     @UriParam(label = "common",
               description = "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer).")
     private String replyTo;
     @UriParam(label = "producer",
               description = "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.")
+                            + " Possible values are: Temporary or Exclusive."
+                            + " By default Camel will use temporary queues. However if replyTo has been configured, then Exclusive is used.")
     private ReplyToType replyToType;
     @UriParam(defaultValue = "AUTO_ACKNOWLEDGE",
               enums = "SESSION_TRANSACTED,CLIENT_ACKNOWLEDGE,AUTO_ACKNOWLEDGE,DUPS_OK_ACKNOWLEDGE",
@@ -115,13 +106,13 @@ public class SjmsEndpoint extends DefaultEndpoint
               description = "Specifies the default number of concurrent consumers when doing request/reply over JMS."
                             + " See also the maxMessagesPerTask option to control dynamic scaling up/down of threads.")
     private int replyToConcurrentConsumers = 1;
-    @UriParam(label = "producer", defaultValue = "false",
+    @UriParam(label = "producer,advanced", defaultValue = "false",
               description = "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.")
     private Boolean explicitQosEnabled;
-    @UriParam(label = "producer",
+    @UriParam(label = "producer,advanced",
               description = "Set to true, if you want to send message using the QoS settings specified on the message,"
                             + " instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode,"
                             + " and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the"
@@ -170,8 +161,13 @@ public class SjmsEndpoint extends DefaultEndpoint
               description = "When sending messages, specifies the time-to-live of the message (in milliseconds).")
     private long timeToLive = -1;
     @UriParam(label = "consumer",
-              description = "Sets the durable subscription Id required for durable topics.")
-    private String durableSubscriptionId;
+              description = "Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance."
+                            + " It is typically only required for durable topic subscriptions."
+                            + " If using Apache ActiveMQ you may prefer to use Virtual Topics instead.")
+    private String clientId;
+    @UriParam(label = "consumer",
+              description = "The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configured as well.")
+    private String durableSubscriptionName;
     @UriParam(defaultValue = "20000", label = "producer", javaType = "java.time.Duration",
               description = "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"
@@ -222,23 +218,13 @@ public class SjmsEndpoint extends DefaultEndpoint
                             + " 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.")
-    private JmsKeyFormatStrategy jmsKeyFormatStrategy;
-    @UriParam(label = "advanced",
-              description = "Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any")
+    private JmsKeyFormatStrategy jmsKeyFormatStrategy = new DefaultJmsKeyFormatStrategy();
+    @UriParam(label = "common",
+              description = "The connection factory to be use. A connection factory must be configured either on the component or endpoint.")
     private ConnectionFactory connectionFactory;
     @UriParam(label = "advanced",
-              description = "The maximum number of connections available to this endpoint")
-    @Deprecated
-    private Integer connectionCount;
-    @UriParam(label = "advanced",
               description = "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions.")
     private ExceptionListener exceptionListener;
-    @UriParam(defaultValue = "WARN", label = "consumer,logging",
-              description = "Allows to configure the default errorHandler logging level for logging uncaught exceptions.")
-    private LoggingLevel errorHandlerLoggingLevel = LoggingLevel.WARN;
-    @UriParam(defaultValue = "true", label = "consumer,logging",
-              description = "Allows to control whether stacktraces should be logged or not, by the default errorHandler.")
-    private boolean errorHandlerLogStackTrace = true;
     @UriParam(defaultValue = "5000", label = "advanced", javaType = "java.time.Duration",
               description = "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds."
                             + " The default is 5000 ms, that is, 5 seconds.")
@@ -272,11 +258,6 @@ public class SjmsEndpoint extends DefaultEndpoint
                             + " Note if transacted has been enabled, then asyncConsumer=true does not run asynchronously, as transaction"
                             + "  must be executed synchronously (Camel 3.0 may support async transactions).")
     private boolean asyncConsumer;
-    @UriParam(label = "producer,advanced",
-              description = "Only applicable when sending to JMS destination using InOnly (eg fire and forget)."
-                            + " Enabling this option will enrich the Camel Exchange with the actual JMSMessageID"
-                            + " that was used by the JMS client when the message was sent to the JMS destination.")
-    private boolean includeSentJMSMessageID;
 
     private JmsObjectFactory jmsObjectFactory = new Jms11ObjectFactory();
 
@@ -294,6 +275,15 @@ public class SjmsEndpoint extends DefaultEndpoint
         return (SjmsComponent) super.getComponent();
     }
 
+    @Override
+    protected void doInit() throws Exception {
+        super.doInit();
+
+        if (headerFilterStrategy == null) {
+            headerFilterStrategy = new SjmsHeaderFilterStrategy(includeAllJMSXProperties);
+        }
+    }
+
     /**
      * Gets the destination name which was configured from the endpoint uri.
      *
@@ -364,7 +354,6 @@ public class SjmsEndpoint extends DefaultEndpoint
      * Factory method for creating a new template for InOnly message exchanges
      */
     public SjmsTemplate createInOnlyTemplate() {
-        // TODO: Add isPubSub, Destination as parameters so we can have a default destination
         SjmsTemplate template = new SjmsTemplate(getConnectionFactory(), isTransacted(), getAcknowledgementMode().intValue());
 
         // configure qos if enabled
@@ -384,8 +373,17 @@ public class SjmsEndpoint extends DefaultEndpoint
      * Factory method for creating a new template for InOut message exchanges
      */
     public SjmsTemplate createInOutTemplate() {
-        // TODO: Add isPubSub, Destination as parameters so we can have a default destination
-        SjmsTemplate template = createInOnlyTemplate();
+        // must be auto-ack mode for InOut (request/reply mode)
+        SjmsTemplate template = new SjmsTemplate(getConnectionFactory(), false, Session.AUTO_ACKNOWLEDGE);
+
+        // configure qos if enabled
+        if (isExplicitQosEnabled()) {
+            int dm = isDeliveryPersistent() ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT;
+            if (getDeliveryMode() != null) {
+                dm = getDeliveryMode();
+            }
+            template.setQoSSettings(dm, getPriority(), getTimeToLive());
+        }
         if (getRequestTimeout() > 0) {
             template.setExplicitQosEnabled(true);
 
@@ -442,9 +440,6 @@ public class SjmsEndpoint extends DefaultEndpoint
                 getMessageCreatedStrategy());
     }
 
-    /**
-     * Sets the binding used to convert from a Camel message to and from a JMS message
-     */
     public void setBinding(JmsBinding binding) {
         this.binding = binding;
     }
@@ -458,9 +453,6 @@ public class SjmsEndpoint extends DefaultEndpoint
         return getComponent().getAsyncStartStopExecutorService();
     }
 
-    /**
-     * DestinationName is a JMS queue or topic name. By default, the destinationName is interpreted as a queue name.
-     */
     public void setDestinationName(String destinationName) {
         this.destinationName = destinationName;
     }
@@ -477,9 +469,6 @@ public class SjmsEndpoint extends DefaultEndpoint
         return headerFilterStrategy;
     }
 
-    /**
-     * To use a custom HeaderFilterStrategy to filter header to and from Camel message.
-     */
     @Override
     public void setHeaderFilterStrategy(HeaderFilterStrategy strategy) {
         this.headerFilterStrategy = strategy;
@@ -489,11 +478,6 @@ public class SjmsEndpoint extends DefaultEndpoint
         return includeAllJMSXProperties;
     }
 
-    /**
-     * 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.
-     */
     public void setIncludeAllJMSXProperties(boolean includeAllJMSXProperties) {
         this.includeAllJMSXProperties = includeAllJMSXProperties;
     }
@@ -502,17 +486,10 @@ public class SjmsEndpoint extends DefaultEndpoint
         return acknowledgementMode;
     }
 
-    /**
-     * The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE,
-     * DUPS_OK_ACKNOWLEDGE
-     */
     public void setAcknowledgementMode(SessionAcknowledgementType acknowledgementMode) {
         this.acknowledgementMode = acknowledgementMode;
     }
 
-    /**
-     * Flag set by the endpoint used by consumers and producers to determine if the endpoint is a JMS Topic.
-     */
     public boolean isTopic() {
         return topic;
     }
@@ -621,15 +598,20 @@ public class SjmsEndpoint extends DefaultEndpoint
         configuredQoS();
     }
 
-    public String getDurableSubscriptionId() {
-        return durableSubscriptionId;
+    public String getClientId() {
+        return clientId;
     }
 
-    /**
-     * Sets the durable subscription Id required for durable topics.
-     */
-    public void setDurableSubscriptionId(String durableSubscriptionId) {
-        this.durableSubscriptionId = durableSubscriptionId;
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public String getDurableSubscriptionName() {
+        return durableSubscriptionName;
+    }
+
+    public void setDurableSubscriptionName(String durableSubscriptionName) {
+        this.durableSubscriptionName = durableSubscriptionName;
     }
 
     public long getRequestTimeout() {
@@ -644,9 +626,6 @@ public class SjmsEndpoint extends DefaultEndpoint
         return messageSelector;
     }
 
-    /**
-     * Sets the JMS Message selector syntax.
-     */
     public void setMessageSelector(String messageSelector) {
         this.messageSelector = messageSelector;
     }
@@ -655,9 +634,6 @@ public class SjmsEndpoint extends DefaultEndpoint
         return transacted;
     }
 
-    /**
-     * Specifies whether to use transacted mode
-     */
     public void setTransacted(boolean transacted) {
         if (transacted) {
             setAcknowledgementMode(SessionAcknowledgementType.SESSION_TRANSACTED);
@@ -665,19 +641,6 @@ public class SjmsEndpoint extends DefaultEndpoint
         this.transacted = transacted;
     }
 
-    public boolean isSharedJMSSession() {
-        return sharedJMSSession;
-    }
-
-    /**
-     * Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to
-     * multiple JMS providers. If you need transaction against multiple JMS providers, use jms component to leverage XA
-     * transaction.
-     */
-    public void setSharedJMSSession(boolean share) {
-        this.sharedJMSSession = share;
-    }
-
     public String getReplyTo() {
         return replyTo;
     }
@@ -703,21 +666,10 @@ public class SjmsEndpoint extends DefaultEndpoint
         this.testConnectionOnStartup = testConnectionOnStartup;
     }
 
-    /**
-     * Whether to startup the consumer message listener asynchronously, when starting a route. For example if a
-     * JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover.
-     * This will cause Camel to block while starting routes. By setting this option to true, you will let routes
-     * startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this
-     * option is used, then beware that if the connection could not be established, then an exception is logged at WARN
-     * level, and the consumer will not be able to receive messages; You can then restart the route to retry.
-     */
     public void setAsyncStartListener(boolean asyncStartListener) {
         this.asyncStartListener = asyncStartListener;
     }
 
-    /**
-     * Whether to stop the consumer message listener asynchronously, when stopping a route.
-     */
     public void setAsyncStopListener(boolean asyncStopListener) {
         this.asyncStopListener = asyncStopListener;
     }
@@ -742,9 +694,6 @@ public class SjmsEndpoint extends DefaultEndpoint
         return destinationCreationStrategy;
     }
 
-    /**
-     * To use a custom DestinationCreationStrategy.
-     */
     public void setDestinationCreationStrategy(DestinationCreationStrategy destinationCreationStrategy) {
         this.destinationCreationStrategy = destinationCreationStrategy;
     }
@@ -761,10 +710,6 @@ public class SjmsEndpoint extends DefaultEndpoint
         return allowNullBody;
     }
 
-    /**
-     * Whether to allow sending messages with no body. If this option is false and the message body is null, then an
-     * JMSException is thrown.
-     */
     public void setAllowNullBody(boolean allowNullBody) {
         this.allowNullBody = allowNullBody;
     }
@@ -773,10 +718,6 @@ public class SjmsEndpoint extends DefaultEndpoint
         return mapJmsMessage;
     }
 
-    /**
-     * Specifies whether Camel should auto map the received JMS message to a suited payload type, such as
-     * javax.jms.TextMessage to a String etc. See section about how mapping works below for more details.
-     */
     public void setMapJmsMessage(boolean mapJmsMessage) {
         this.mapJmsMessage = mapJmsMessage;
     }
@@ -785,106 +726,38 @@ public class SjmsEndpoint extends DefaultEndpoint
         return messageCreatedStrategy;
     }
 
-    /**
-     * To use the given MessageCreatedStrategy which are invoked when Camel creates new instances of
-     * <tt>javax.jms.Message</tt> objects when Camel is sending a JMS message.
-     */
     public void setMessageCreatedStrategy(MessageCreatedStrategy messageCreatedStrategy) {
         this.messageCreatedStrategy = messageCreatedStrategy;
     }
 
     public JmsKeyFormatStrategy getJmsKeyFormatStrategy() {
-        if (jmsKeyFormatStrategy == null) {
-            jmsKeyFormatStrategy = new DefaultJmsKeyFormatStrategy();
-        }
         return jmsKeyFormatStrategy;
     }
 
-    /**
-     * 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.
-     */
     public void setJmsKeyFormatStrategy(JmsKeyFormatStrategy jmsKeyFormatStrategy) {
         this.jmsKeyFormatStrategy = jmsKeyFormatStrategy;
     }
 
-    /**
-     * Initializes the connectionFactory for the endpoint, which takes precedence over the component's
-     * connectionFactory, if any
-     */
-    public void setConnectionFactory(ConnectionFactory connectionFactory) {
-        this.connectionFactory = connectionFactory;
-    }
-
-    public void setConnectionFactory(String connectionFactory) {
-        this.connectionFactory
-                = EndpointHelper.resolveReferenceParameter(getCamelContext(), connectionFactory, ConnectionFactory.class);
-    }
-
     public ConnectionFactory getConnectionFactory() {
-        if (connectionFactory != null) {
-            return connectionFactory;
-        }
-        return getComponent().getConnectionFactory();
-    }
-
-    public int getConnectionCount() {
-        if (connectionCount != null) {
-            return connectionCount;
-        }
-        return getComponent().getConnectionCount();
+        return connectionFactory;
     }
 
-    /**
-     * The maximum number of connections available to this endpoint
-     */
-    public void setConnectionCount(Integer connectionCount) {
-        this.connectionCount = connectionCount;
+    public void setConnectionFactory(ConnectionFactory connectionFactory) {
+        this.connectionFactory = connectionFactory;
     }
 
     public ExceptionListener getExceptionListener() {
         return exceptionListener;
     }
 
-    /**
-     * Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions.
-     */
     public void setExceptionListener(ExceptionListener exceptionListener) {
         this.exceptionListener = exceptionListener;
     }
 
-    public LoggingLevel getErrorHandlerLoggingLevel() {
-        return errorHandlerLoggingLevel;
-    }
-
-    /**
-     * Allows to configure the default errorHandler logging level for logging uncaught exceptions.
-     */
-    public void setErrorHandlerLoggingLevel(LoggingLevel errorHandlerLoggingLevel) {
-        this.errorHandlerLoggingLevel = errorHandlerLoggingLevel;
-    }
-
-    public boolean isErrorHandlerLogStackTrace() {
-        return errorHandlerLogStackTrace;
-    }
-
-    /**
-     * Allows to control whether stacktraces should be logged or not, by the default errorHandler.
-     */
-    public void setErrorHandlerLogStackTrace(boolean errorHandlerLogStackTrace) {
-        this.errorHandlerLogStackTrace = errorHandlerLogStackTrace;
-    }
-
     public JmsObjectFactory getJmsObjectFactory() {
         return jmsObjectFactory;
     }
 
-    /**
-     * To use a custom Jms Object factory
-     */
     public void setJmsObjectFactory(JmsObjectFactory jmsObjectFactory) {
         this.jmsObjectFactory = jmsObjectFactory;
     }
@@ -920,12 +793,4 @@ public class SjmsEndpoint extends DefaultEndpoint
     public void setAsyncConsumer(boolean asyncConsumer) {
         this.asyncConsumer = asyncConsumer;
     }
-
-    public boolean isIncludeSentJMSMessageID() {
-        return includeSentJMSMessageID;
-    }
-
-    public void setIncludeSentJMSMessageID(boolean includeSentJMSMessageID) {
-        this.includeSentJMSMessageID = includeSentJMSMessageID;
-    }
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsLoggingExceptionListener.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsLoggingExceptionListener.java
deleted file mode 100644
index 87befd7..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsLoggingExceptionListener.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms;
-
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-
-import org.apache.camel.spi.ExceptionHandler;
-
-/**
- * A JMS {@link ExceptionListener} which logs all caught exceptions.
- */
-public class SjmsLoggingExceptionListener implements ExceptionListener {
-
-    private final ExceptionHandler handler;
-    private final boolean logStackTrace;
-
-    public SjmsLoggingExceptionListener(ExceptionHandler exceptionHandler, boolean logStackTrace) {
-        this.handler = exceptionHandler;
-        this.logStackTrace = logStackTrace;
-    }
-
-    @Override
-    public void onException(JMSException throwable) {
-        if (logStackTrace) {
-            handler.handleException("Execution of JMS message listener failed", throwable);
-        } else {
-            handler.handleException("Execution of JMS message listener failed. Caused by: [" + throwable.getMessage() + "]",
-                    null);
-        }
-    }
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
index 57ee7ed..539d41c 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
@@ -29,7 +29,6 @@ import javax.jms.Session;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedExchange;
 import org.apache.camel.FailedToCreateProducerException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.RuntimeExchangeException;
@@ -40,14 +39,11 @@ import org.apache.camel.component.sjms.reply.ReplyManager;
 import org.apache.camel.component.sjms.reply.TemporaryQueueReplyManager;
 import org.apache.camel.spi.UuidGenerator;
 import org.apache.camel.support.DefaultAsyncProducer;
-import org.apache.camel.support.SynchronizationAdapter;
 import org.apache.camel.support.service.ServiceHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-import static org.apache.camel.component.sjms.SjmsHelper.*;
 import static org.apache.camel.component.sjms.jms.JmsMessageHelper.*;
 
 public class SjmsProducer extends DefaultAsyncProducer {
@@ -305,14 +301,13 @@ public class SjmsProducer extends DefaultAsyncProducer {
                     throw new RuntimeExchangeException("Failed to resolve replyTo destination", exchange);
                 }
                 JmsMessageHelper.setJMSReplyTo(answer, replyTo);
-                replyManager.setReplyToSelectorHeader(in, answer);
 
                 String correlationId = determineCorrelationId(answer);
                 replyManager.registerReply(replyManager, exchange, callback, originalCorrelationId, correlationId, timeout);
 
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("Using {}: {}, JMSReplyTo destination: {}, with request timeout: {} ms.",
-                            new Object[] { "JMSCorrelationID", correlationId, replyTo, timeout });
+                            "JMSCorrelationID", correlationId, replyTo, timeout);
                 }
 
                 LOG.trace("Created javax.jms.Message: {}", answer);
@@ -321,7 +316,7 @@ public class SjmsProducer extends DefaultAsyncProducer {
         };
 
         try {
-            doSend(true, destinationName, messageCreator);
+            doSend(exchange, true, destinationName, messageCreator);
         } catch (Exception e) {
             exchange.setException(e);
             callback.done(true);
@@ -411,22 +406,13 @@ public class SjmsProducer extends DefaultAsyncProducer {
                     JmsMessageHelper.setJMSReplyTo(answer, null);
                 }
 
-                // if transacted or client ack mode then add uow work to complete after exchange is done
-                if (isTransactionOrClientAcknowledgeMode(session)) {
-                    ExtendedExchange ecc = exchange.adapt(ExtendedExchange.class);
-                    TransactionOnCompletion toc = new TransactionOnCompletion(session, answer);
-                    if (!ecc.containsOnCompletion(toc)) {
-                        ecc.addOnCompletion(toc);
-                    }
-                }
-
                 LOG.trace("Created javax.jms.Message: {}", answer);
                 return answer;
             }
         };
 
         try {
-            doSend(false, destinationName, messageCreator);
+            doSend(exchange, false, destinationName, messageCreator);
         } catch (Exception e) {
             exchange.setException(e);
             callback.done(true);
@@ -515,11 +501,13 @@ public class SjmsProducer extends DefaultAsyncProducer {
     /**
      * Sends the message using the JmsTemplate.
      *
+     * @param exchange        the exchange
      * @param inOut           use inOut or inOnly template
      * @param destinationName the destination
      * @param messageCreator  the creator to create the {@link Message} to send
      */
     protected void doSend(
+            Exchange exchange,
             boolean inOut, String destinationName,
             MessageCreator messageCreator)
             throws Exception {
@@ -530,7 +518,7 @@ public class SjmsProducer extends DefaultAsyncProducer {
             LOG.trace("Using {} jms template", inOut ? "inOut" : "inOnly");
         }
 
-        template.send(destinationName, messageCreator, getEndpoint().isTopic());
+        template.send(exchange, destinationName, messageCreator, getEndpoint().isTopic());
     }
 
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java
index f725b16..3011efd 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java
@@ -23,6 +23,8 @@ import javax.jms.Message;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
+import org.apache.camel.Exchange;
+import org.apache.camel.ExtendedExchange;
 import org.apache.camel.component.sjms.jms.DestinationCreationStrategy;
 import org.apache.camel.component.sjms.jms.MessageCreator;
 import org.apache.camel.util.ObjectHelper;
@@ -76,39 +78,78 @@ public class SjmsTemplate {
         this.explicitQosEnabled = explicitQosEnabled;
     }
 
-    public <T> T execute(SessionCallback<T> sessionCallback) throws Exception {
+    public void execute(SessionCallback sessionCallback) throws Exception {
         Connection con = null;
         Session session = null;
         try {
             con = createConnection();
             session = createSession(con);
-            return sessionCallback.doInJms(session);
+            sessionCallback.doInJms(session);
         } finally {
-            closeSession(session);
-            closeConnection(con);
+            sessionCallback.onClose(con, session);
         }
     }
 
-    public <T> T execute(Session session, SessionCallback<T> sessionCallback) throws Exception {
+    public void execute(Session session, SessionCallback sessionCallback) throws Exception {
         if (session == null) {
-            return execute(sessionCallback);
+            execute(sessionCallback);
         } else {
-            return sessionCallback.doInJms(session);
+            try {
+                sessionCallback.doInJms(session);
+            } finally {
+                sessionCallback.onClose(null, session);
+            }
         }
     }
 
-    public void send(String destinationName, MessageCreator messageCreator, boolean isTopic) throws Exception {
-        execute(session -> {
-            Destination dest = destinationCreationStrategy.createDestination(session, destinationName, isTopic);
-            Message message = messageCreator.createMessage(session);
-            MessageProducer producer = session.createProducer(dest);
-            try {
-                send(producer, message);
-            } finally {
-                closeProducer(producer);
+    public void send(Exchange exchange, String destinationName, MessageCreator messageCreator, boolean isTopic)
+            throws Exception {
+
+        final SessionCallback callback = new SessionCallback() {
+
+            private volatile Message message;
+            private volatile boolean transacted;
+
+            @Override
+            public void doInJms(Session session) throws Exception {
+                this.transacted = isTransactionOrClientAcknowledgeMode(session);
+
+                if (transacted) {
+                    // remember current session if transactional
+                    exchange.setProperty(SjmsConstants.JMS_SESSION, session);
+                }
+
+                Destination dest = destinationCreationStrategy.createDestination(session, destinationName, isTopic);
+                this.message = messageCreator.createMessage(session);
+                MessageProducer producer = session.createProducer(dest);
+                try {
+                    send(producer, message);
+                } finally {
+                    closeProducer(producer);
+                }
             }
-            return null;
-        });
+
+            @Override
+            public void onClose(Connection connection, Session session) {
+                try {
+                    if (transacted) {
+                        // defer closing till end of UoW
+                        ExtendedExchange ecc = exchange.adapt(ExtendedExchange.class);
+                        TransactionOnCompletion toc = new TransactionOnCompletion(session, this.message);
+                        if (!ecc.containsOnCompletion(toc)) {
+                            ecc.addOnCompletion(toc);
+                        }
+                    } else {
+                        closeSession(session);
+                        closeConnection(connection);
+                    }
+                } catch (Exception e) {
+                    // ignore
+                }
+            }
+        };
+
+        execute(callback);
     }
 
     public void send(MessageProducer producer, Message message) throws Exception {
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionCommitStrategy.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionCommitStrategy.java
deleted file mode 100644
index 055fd91..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionCommitStrategy.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms;
-
-import org.apache.camel.Exchange;
-
-/**
- * Provides a entry point into the transaction {@link org.apache.camel.spi.Synchronization} workflow that will allow a
- * user to control when the {@link javax.jms.Session} commit operation is executed.
- */
-public interface TransactionCommitStrategy {
-
-    /**
-     * Should returns true to allow the commit to proceed. If false, the commit will be skipped. The default should
-     * always be true to avoid messages remaining uncommitted.
-     *
-     * @param  exchange {@link org.apache.camel.Exchange}
-     * @return          true if the {@link javax.jms.Session} should be committed, otherwise false
-     */
-    boolean commit(Exchange exchange) throws Exception;
-
-    /**
-     * Should returns true to allow the commit to proceed. If false, the commit will be skipped. The default should
-     * always be true to avoid messages remaining uncommitted.
-     *
-     * @param  exchange {@link org.apache.camel.Exchange}
-     * @return          true if the {@link javax.jms.Session} should be committed, otherwise false
-     */
-    boolean rollback(Exchange exchange) throws Exception;
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
index 3674cde..c4b9489 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
@@ -22,14 +22,13 @@ import javax.jms.Session;
 import org.apache.camel.Exchange;
 import org.apache.camel.support.SynchronizationAdapter;
 
-
 import static org.apache.camel.component.sjms.SjmsHelper.*;
 
 /**
- * Completion {@link org.apache.camel.spi.Synchronization} work when
- * processing the message is complete to either commit or rollback the session.
+ * Completion {@link org.apache.camel.spi.Synchronization} work when processing the message is complete to either commit
+ * or rollback the session.
  */
-class TransactionOnCompletion extends SynchronizationAdapter implements Comparable<TransactionOnCompletion> {
+class TransactionOnCompletion extends SynchronizationAdapter {
 
     // TODO: close session, connection
 
@@ -57,12 +56,9 @@ class TransactionOnCompletion extends SynchronizationAdapter implements Comparab
     }
 
     @Override
-    public int compareTo(TransactionOnCompletion o) {
-        // same session and message
-        if (session == o.session && message == o.message) {
-            return 0;
-        } else {
-            return -1;
-        }
+    public boolean equals(Object o) {
+        TransactionOnCompletion that = (TransactionOnCompletion) o;
+        return session == that.session && message == that.message;
     }
+
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/EndpointMessageListener.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/EndpointMessageListener.java
index 055365c..079d2fc 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/EndpointMessageListener.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/EndpointMessageListener.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.sjms.consumer;
 
+import javax.jms.Connection;
 import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -31,7 +32,9 @@ import org.apache.camel.ExchangePattern;
 import org.apache.camel.Processor;
 import org.apache.camel.RollbackExchangeException;
 import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.component.sjms.SessionCallback;
 import org.apache.camel.component.sjms.SessionMessageListener;
+import org.apache.camel.component.sjms.SjmsConstants;
 import org.apache.camel.component.sjms.SjmsEndpoint;
 import org.apache.camel.component.sjms.SjmsTemplate;
 import org.apache.camel.component.sjms.jms.JmsMessageHelper;
@@ -240,6 +243,10 @@ public class EndpointMessageListener implements SessionMessageListener {
                 exchange.setPattern(ExchangePattern.InOut);
             }
         }
+
+        // store session on exchange as we may need it for transactions support
+        exchange.setProperty(SjmsConstants.JMS_SESSION, session);
+
         return exchange;
     }
 
@@ -252,24 +259,34 @@ public class EndpointMessageListener implements SessionMessageListener {
             return;
         }
         try {
-            getTemplate().execute(session, sc -> {
-                MessageProducer producer = null;
-                try {
-                    Message reply = endpoint.getBinding().makeJmsMessage(exchange, out, sc, cause);
-                    final String correlationID = determineCorrelationId(message);
-                    reply.setJMSCorrelationID(correlationID);
-
-                    if (LOG.isDebugEnabled()) {
-                        LOG.debug("{} sending reply JMS message [correlationId:{}]: {}", endpoint, correlationID, reply);
+            SessionCallback callback = new SessionCallback() {
+                @Override
+                public void doInJms(Session session) throws Exception {
+                    MessageProducer producer = null;
+                    try {
+                        Message reply = endpoint.getBinding().makeJmsMessage(exchange, out, session, cause);
+                        final String correlationID = determineCorrelationId(message);
+                        reply.setJMSCorrelationID(correlationID);
+
+                        if (LOG.isDebugEnabled()) {
+                            LOG.debug("{} sending reply JMS message [correlationId:{}]: {}", endpoint, correlationID, reply);
+                        }
+
+                        producer = endpoint.getJmsObjectFactory().createMessageProducer(session, endpoint, replyDestination);
+                        template.send(producer, reply);
+                    } finally {
+                        close(producer);
                     }
+                }
 
-                    producer = endpoint.getJmsObjectFactory().createMessageProducer(sc, endpoint, replyDestination);
-                    template.send(producer, reply);
-                } finally {
-                    close(producer);
+                @Override
+                public void onClose(Connection connection, Session session) {
+                    // do not close as we use provided session
                 }
-                return null;
-            });
+            };
+
+            getTemplate().execute(session, callback);
+
         } catch (Exception e) {
             exchange.setException(new CamelExchangeException("Unable to send reply JMS message", exchange, e));
         }
@@ -284,24 +301,34 @@ public class EndpointMessageListener implements SessionMessageListener {
             return;
         }
         try {
-            getTemplate().execute(session, sc -> {
-                MessageProducer producer = null;
-                try {
-                    Message reply = endpoint.getBinding().makeJmsMessage(exchange, out, sc, cause);
-                    final String correlationID = determineCorrelationId(message);
-                    reply.setJMSCorrelationID(correlationID);
-
-                    if (LOG.isDebugEnabled()) {
-                        LOG.debug("{} sending reply JMS message [correlationId:{}]: {}", endpoint, correlationID, reply);
+            SessionCallback callback = new SessionCallback() {
+                @Override
+                public void doInJms(Session session) throws Exception {
+                    MessageProducer producer = null;
+                    try {
+                        Message reply = endpoint.getBinding().makeJmsMessage(exchange, out, session, cause);
+                        final String correlationID = determineCorrelationId(message);
+                        reply.setJMSCorrelationID(correlationID);
+
+                        if (LOG.isDebugEnabled()) {
+                            LOG.debug("{} sending reply JMS message [correlationId:{}]: {}", endpoint, correlationID, reply);
+                        }
+
+                        producer = endpoint.getJmsObjectFactory().createMessageProducer(session, endpoint, replyDestination);
+                        template.send(producer, reply);
+                    } finally {
+                        close(producer);
                     }
+                }
 
-                    producer = endpoint.getJmsObjectFactory().createMessageProducer(sc, endpoint, replyDestination);
-                    template.send(producer, reply);
-                } finally {
-                    close(producer);
+                @Override
+                public void onClose(Connection connection, Session session) {
+                    // do not close as we use provided session
                 }
-                return null;
-            });
+            };
+
+            getTemplate().execute(session, callback);
+
         } catch (Exception e) {
             exchange.setException(new CamelExchangeException("Unable to send reply JMS message", exchange, e));
         }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java
index c2cb3cb..2b15649 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java
@@ -247,8 +247,7 @@ public class SimpleMessageListenerContainer extends ServiceSupport
                 sessions = new HashSet<>(concurrentConsumers);
                 consumers = new HashSet<>(concurrentConsumers);
                 for (int i = 0; i < this.concurrentConsumers; i++) {
-                    Session session
-                            = connection.createSession(endpoint.isTransacted(), endpoint.getAcknowledgementMode().intValue());
+                    Session session = createSession(connection, endpoint);
                     MessageConsumer consumer = createMessageConsumer(session);
                     configureConsumer(consumer, session);
                     sessions.add(session);
@@ -258,6 +257,10 @@ public class SimpleMessageListenerContainer extends ServiceSupport
         }
     }
 
+    protected Session createSession(Connection connection, SjmsEndpoint endpoint) throws Exception {
+        return connection.createSession(endpoint.isTransacted(), endpoint.getAcknowledgementMode().intValue());
+    }
+
     protected MessageConsumer createMessageConsumer(Session session) throws Exception {
         return endpoint.getJmsObjectFactory().createMessageConsumer(session, endpoint);
     }
@@ -285,7 +288,7 @@ public class SimpleMessageListenerContainer extends ServiceSupport
                 Connection con = null;
                 try {
                     con = endpoint.getConnectionFactory().createConnection();
-                    String cid = clientId != null ? clientId : endpoint.getComponent().getClientId();
+                    String cid = clientId != null ? clientId : endpoint.getClientId();
                     if (cid != null) {
                         con.setClientID(cid);
                     }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java
index 3bc7d69..0dc14ad 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java
@@ -39,7 +39,7 @@ public class Jms11ObjectFactory implements JmsObjectFactory {
         Destination destination = sjmsEndpoint.getDestinationCreationStrategy().createDestination(session,
                 sjmsEndpoint.getDestinationName(), sjmsEndpoint.isTopic());
         return createMessageConsumer(session, destination, sjmsEndpoint.getMessageSelector(), sjmsEndpoint.isTopic(),
-                sjmsEndpoint.getDurableSubscriptionId(), true, false);
+                sjmsEndpoint.getDurableSubscriptionName(), true, false);
     }
 
     @Override
@@ -53,29 +53,29 @@ public class Jms11ObjectFactory implements JmsObjectFactory {
             Destination destination,
             String messageSelector,
             boolean topic,
-            String subscriptionId,
+            String subscriptionName,
             boolean durable,
             boolean shared)
             throws Exception {
         // noLocal is default false according to JMS spec
-        return createMessageConsumer(session, destination, messageSelector, topic, subscriptionId, durable, shared, false);
+        return createMessageConsumer(session, destination, messageSelector, topic, subscriptionName, durable, shared, false);
     }
 
     @Override
     public MessageConsumer createMessageConsumer(
             Session session, Destination destination,
-            String messageSelector, boolean topic, String subscriptionId, boolean durable,
+            String messageSelector, boolean topic, String subscriptionName, boolean durable,
             boolean shared, boolean noLocal)
             throws Exception {
         MessageConsumer messageConsumer;
 
         if (topic) {
-            if (ObjectHelper.isNotEmpty(subscriptionId)) {
+            if (ObjectHelper.isNotEmpty(subscriptionName)) {
                 if (ObjectHelper.isNotEmpty(messageSelector)) {
-                    messageConsumer = session.createDurableSubscriber((Topic) destination, subscriptionId,
+                    messageConsumer = session.createDurableSubscriber((Topic) destination, subscriptionName,
                             messageSelector, noLocal);
                 } else {
-                    messageConsumer = session.createDurableSubscriber((Topic) destination, subscriptionId);
+                    messageConsumer = session.createDurableSubscriber((Topic) destination, subscriptionName);
                 }
             } else {
                 if (ObjectHelper.isNotEmpty(messageSelector)) {
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsBinding.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsBinding.java
index ed88c67..bfd7c29 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsBinding.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsBinding.java
@@ -90,18 +90,6 @@ public class JmsBinding {
      */
     public Object extractBodyFromJms(Exchange exchange, Message message) {
         try {
-
-            // TODO: new options to support
-
-            // is a custom message converter configured on endpoint then use it instead of doing the extraction
-            // based on message type
-            /*            if (endpoint != null && endpoint.getMessageConverter() != null) {
-                if (log.isTraceEnabled()) {
-                    log.trace("Extracting body using a custom MessageConverter: {} from JMS message: {}", endpoint.getMessageConverter(), message);
-                }
-                return endpoint.getMessageConverter().fromMessage(message);
-            }
-            */
             // if we are configured to not map the jms message then return it as body
             if (!mapJmsMessage) {
                 LOG.trace("Option map JMS message is false so using JMS message as body: {}", message);
@@ -218,22 +206,6 @@ public class JmsBinding {
      * Creates a JMS message from the Camel exchange and message
      *
      * @param  exchange     the current exchange
-     * @param  session      the JMS session used to create the message
-     * @return              a newly created JMS Message instance containing the
-     * @throws JMSException if the message could not be created
-     */
-    public Message makeJmsMessage(Exchange exchange, Session session) throws JMSException {
-        Message answer = makeJmsMessage(exchange, exchange.getIn(), session, null);
-        if (answer != null && messageCreatedStrategy != null) {
-            messageCreatedStrategy.onMessageCreated(answer, session, exchange, null);
-        }
-        return answer;
-    }
-
-    /**
-     * Creates a JMS message from the Camel exchange and message
-     *
-     * @param  exchange     the current exchange
      * @param  camelMessage the body to make a javax.jms.Message as
      * @param  session      the JMS session used to create the message
      * @param  cause        optional exception occurred that should be sent as reply instead of a regular body
@@ -434,37 +406,7 @@ public class JmsBinding {
             throws JMSException {
         JmsMessageType type = null;
 
-        // TODO: support some of these options?
-
-        /*        // special for transferExchange
-        if (endpoint != null && endpoint.isTransferExchange()) {
-            log.trace("Option transferExchange=true so we use JmsMessageType: Object");
-            Serializable holder = DefaultExchangeHolder.marshal(exchange);
-            Message answer = session.createObjectMessage(holder);
-            // ensure default delivery mode is used by default
-            answer.setJMSDeliveryMode(Message.DEFAULT_DELIVERY_MODE);
-            return answer;
-        }
-        
-        // use a custom message converter
-        if (endpoint != null && endpoint.getMessageConverter() != null) {
-            if (log.isTraceEnabled()) {
-                log.trace("Creating JmsMessage using a custom MessageConverter: {} with body: {}", endpoint.getMessageConverter(), body);
-            }
-            return endpoint.getMessageConverter().toMessage(body, session);
-        }
-        */
-        // check if header have a type set, if so we force to use it
-        /*
-        if (headers.containsKey(JmsConstants.JMS_MESSAGE_TYPE)) {
-            type = context.getTypeConverter().convertTo(JmsMessageType.class, headers.get(JmsConstants.JMS_MESSAGE_TYPE));
-        } else if (endpoint != null && endpoint.getConfiguration().getJmsMessageType() != null) {
-            // force a specific type from the endpoint configuration
-            type = endpoint.getConfiguration().getJmsMessageType();
-        } else {
-        */
         type = getJMSMessageTypeForBody(exchange, body, headers, session, context);
-        //}
 
         // create the JmsMessage based on the type
         if (type != null) {
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ExclusiveQueueMessageListenerContainer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ExclusiveQueueMessageListenerContainer.java
index 1c416fc..3fb891c 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ExclusiveQueueMessageListenerContainer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ExclusiveQueueMessageListenerContainer.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.sjms.reply;
 
+import javax.jms.Connection;
 import javax.jms.Destination;
 import javax.jms.MessageConsumer;
 import javax.jms.Session;
@@ -41,6 +42,12 @@ public class ExclusiveQueueMessageListenerContainer extends SimpleMessageListene
     }
 
     @Override
+    protected Session createSession(Connection connection, SjmsEndpoint endpoint) throws Exception {
+        // cannot be transacted when doing request/reply
+        return connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+    }
+
+    @Override
     protected MessageConsumer createMessageConsumer(Session session) throws Exception {
         Destination destination = getDestinationCreationStrategy().createDestination(session, getDestinationName(), false);
         return getEndpoint().getJmsObjectFactory().createQueueMessageConsumer(session, destination);
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/QueueReplyManager.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/QueueReplyManager.java
index 30ee6ee..7ef7da1 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/QueueReplyManager.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/QueueReplyManager.java
@@ -21,9 +21,7 @@ import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.Session;
 
-import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
 import org.apache.camel.component.sjms.MessageListenerContainer;
 import org.apache.camel.component.sjms.ReplyToType;
 import org.apache.camel.component.sjms.consumer.SimpleMessageListenerContainer;
@@ -39,20 +37,6 @@ public class QueueReplyManager extends ReplyManagerSupport {
     }
 
     @Override
-    protected ReplyHandler createReplyHandler(
-            ReplyManager replyManager, Exchange exchange, AsyncCallback callback,
-            String originalCorrelationId, String correlationId, long requestTimeout) {
-        return new QueueReplyHandler(
-                replyManager, exchange, callback,
-                originalCorrelationId, correlationId, requestTimeout);
-    }
-
-    @Override
-    public void setReplyToSelectorHeader(org.apache.camel.Message camelMessage, Message jmsMessage) throws JMSException {
-        // noop
-    }
-
-    @Override
     public void updateCorrelationId(String correlationId, String newCorrelationId, long requestTimeout) {
         log.trace("Updated provisional correlationId [{}] to expected correlationId [{}]", correlationId, newCorrelationId);
 
@@ -130,7 +114,7 @@ public class QueueReplyManager extends ReplyManagerSupport {
         answer.setDestinationCreationStrategy(new DestinationResolverDelegate(endpoint.getDestinationCreationStrategy()));
         answer.setDestinationName(endpoint.getReplyTo());
 
-        String clientId = endpoint.getComponent().getClientId();
+        String clientId = endpoint.getClientId();
         if (clientId != null) {
             clientId += ".CamelReplyManager";
             answer.setClientId(clientId);
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManager.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManager.java
index 60fdc8e..b0ddc96 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManager.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManager.java
@@ -20,8 +20,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 
 import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
@@ -58,24 +56,11 @@ public interface ReplyManager extends SessionMessageListener {
     void setOnTimeoutExecutorService(ExecutorService executorService);
 
     /**
-     * Sets the JMS message property used for message correlation. If set message correlation will be performed on the
-     * value of this JMS property, JMSCorrelationID will be ignored.
-     */
-    @Deprecated
-    void setCorrelationProperty(String correlationProperty);
-
-    /**
      * Gets the reply to queue being used
      */
     Destination getReplyTo();
 
     /**
-     * To be used when a reply queue is used with a custom JMS selector is being used.
-     */
-    @Deprecated
-    void setReplyToSelectorHeader(org.apache.camel.Message camelMessage, Message jmsMessage) throws JMSException;
-
-    /**
      * Register a reply
      *
      * @param  replyManager          the reply manager being used
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManagerSupport.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManagerSupport.java
index 22a195f..b1342e3 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManagerSupport.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManagerSupport.java
@@ -41,6 +41,8 @@ import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.component.sjms.jms.JmsMessageHelper.getJMSCorrelationIDAsBytes;
+
 /**
  * Base class for {@link ReplyManager} implementations.
  */
@@ -56,7 +58,6 @@ public abstract class ReplyManagerSupport extends ServiceSupport implements Repl
     protected final CountDownLatch replyToLatch = new CountDownLatch(1);
     protected final long replyToTimeout = 10000;
     protected CorrelationTimeoutMap correlation;
-    protected String correlationProperty;
 
     public ReplyManagerSupport(CamelContext camelContext) {
         this.camelContext = camelContext;
@@ -86,11 +87,6 @@ public abstract class ReplyManagerSupport extends ServiceSupport implements Repl
     }
 
     @Override
-    public void setCorrelationProperty(final String correlationProperty) {
-        this.correlationProperty = correlationProperty;
-    }
-
-    @Override
     public Destination getReplyTo() {
         if (replyTo != null) {
             return replyTo;
@@ -129,23 +125,9 @@ public abstract class ReplyManagerSupport extends ServiceSupport implements Repl
         return correlationId;
     }
 
-    protected abstract ReplyHandler createReplyHandler(
-            ReplyManager replyManager, Exchange exchange, AsyncCallback callback,
-            String originalCorrelationId, String correlationId, long requestTimeout);
-
     @Override
     public void onMessage(Message message, Session session) throws JMSException {
-        String correlationID = null;
-
-        try {
-            if (correlationProperty == null) {
-                correlationID = message.getJMSCorrelationID();
-            } else {
-                correlationID = message.getStringProperty(correlationProperty);
-            }
-        } catch (JMSException e) {
-            // ignore
-        }
+        String correlationID = getJMSCorrelationIDAsBytes(message);
 
         if (correlationID == null) {
             log.warn("Ignoring message with no correlationID: {}", message);
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueMessageListenerContainer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueMessageListenerContainer.java
index 3e1c933..36769c9 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueMessageListenerContainer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueMessageListenerContainer.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.sjms.reply;
 
+import javax.jms.Connection;
 import javax.jms.Destination;
 import javax.jms.MessageConsumer;
 import javax.jms.Session;
@@ -36,6 +37,12 @@ public class TemporaryQueueMessageListenerContainer extends SimpleMessageListene
     }
 
     @Override
+    protected Session createSession(Connection connection, SjmsEndpoint endpoint) throws Exception {
+        // cannot be transacted when doing request/reply
+        return connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+    }
+
+    @Override
     protected MessageConsumer createMessageConsumer(Session session) throws Exception {
         Destination destination = getDestinationCreationStrategy().createTemporaryDestination(session, false);
         return getEndpoint().getJmsObjectFactory().createQueueMessageConsumer(session, destination);
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyManager.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyManager.java
index 6210d53..7c37807 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyManager.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyManager.java
@@ -25,9 +25,7 @@ import javax.jms.Message;
 import javax.jms.Session;
 import javax.jms.TemporaryQueue;
 
-import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
 import org.apache.camel.component.sjms.MessageListenerContainer;
 import org.apache.camel.component.sjms.jms.DestinationCreationStrategy;
 
@@ -53,13 +51,6 @@ public class TemporaryQueueReplyManager extends ReplyManagerSupport {
     }
 
     @Override
-    protected ReplyHandler createReplyHandler(
-            ReplyManager replyManager, Exchange exchange, AsyncCallback callback,
-            String originalCorrelationId, String correlationId, long requestTimeout) {
-        return new TemporaryQueueReplyHandler(this, exchange, callback, originalCorrelationId, correlationId, requestTimeout);
-    }
-
-    @Override
     public void updateCorrelationId(String correlationId, String newCorrelationId, long requestTimeout) {
         log.trace("Updated provisional correlationId [{}] to expected correlationId [{}]", correlationId, newCorrelationId);
 
@@ -84,17 +75,12 @@ public class TemporaryQueueReplyManager extends ReplyManagerSupport {
     }
 
     @Override
-    public void setReplyToSelectorHeader(org.apache.camel.Message camelMessage, Message jmsMessage) throws JMSException {
-        // noop
-    }
-
-    @Override
     protected MessageListenerContainer createListenerContainer() throws Exception {
         TemporaryQueueMessageListenerContainer answer
                 = new TemporaryQueueMessageListenerContainer(endpoint);
         answer.setMessageListener(this);
 
-        String clientId = endpoint.getComponent().getClientId();
+        String clientId = endpoint.getClientId();
         if (clientId != null) {
             clientId += ".CamelReplyManager";
             answer.setClientId(clientId);
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java
index c689b5b..9d64033 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java
@@ -69,7 +69,6 @@ public class SjmsEndpointNameOverrideTest extends CamelTestSupport {
         ActiveMQConnectionFactory connectionFactory
                 = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
         SjmsComponent component = new SjmsComponent();
-        component.setConnectionCount(1);
         component.setConnectionFactory(connectionFactory);
         camelContext.addComponent(BEAN_NAME, component);
 
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
index 723226f..f20722c 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
@@ -161,7 +161,6 @@ public class SjmsEndpointTest extends CamelTestSupport {
         ActiveMQConnectionFactory connectionFactory
                 = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
         SjmsComponent component = new SjmsComponent();
-        component.setConnectionCount(3);
         component.setConnectionFactory(connectionFactory);
         camelContext.addComponent("sjms", component);
 
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
index 788d264..f435a57 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.component.sjms.consumer;
 
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.pool.PooledConnectionFactory;
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -47,7 +49,12 @@ public class InOnlyTopicDurableConsumerTest extends JmsTestSupport {
     protected CamelContext createCamelContext() throws Exception {
         CamelContext context = super.createCamelContext();
         SjmsComponent sjms = context.getComponent("sjms", SjmsComponent.class);
+
+        // need to use a pooled CF so we reuse same connection for multiple client connections
+        PooledConnectionFactory pcf = new PooledConnectionFactory((ActiveMQConnectionFactory) sjms.getConnectionFactory());
+        sjms.setConnectionFactory(pcf);
         sjms.setClientId(CONNECTION_ID);
+
         return context;
     }
 
@@ -56,10 +63,10 @@ public class InOnlyTopicDurableConsumerTest extends JmsTestSupport {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("sjms:topic:foo?durableSubscriptionId=bar1")
+                from("sjms:topic:foo?durableSubscriptionName=bar1")
                         .to("mock:result");
 
-                from("sjms:topic:foo?durableSubscriptionId=bar2")
+                from("sjms:topic:foo?durableSubscriptionName=bar2")
                         .to("mock:result2");
             }
         };
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java
index cf0c6c6..ecb3f9a 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java
@@ -30,6 +30,7 @@ public class InOutConsumerQueueTest extends JmsTestSupport {
 
         template.sendBody("sjms:start", "Hello Camel");
         template.sendBody("sjms:start", "Hello World");
+
         assertMockEndpointsSatisfied();
     }
 
@@ -41,7 +42,7 @@ public class InOutConsumerQueueTest extends JmsTestSupport {
                         .to("sjms:queue:in.out.queue?exchangePattern=InOut&replyTo=in.out.queue.response")
                         .to("log:response").to("mock:result");
 
-                from("sjms:queue:in.out.queue?exchangePattern=InOut").process(new Processor() {
+                from("sjms:queue:in.out.queue").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         String body = (String) exchange.getIn().getBody();
                         if (body.contains("Camel")) {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
index cf6856d..e99ea8d 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
@@ -156,7 +156,6 @@ public class JmsTestSupport extends CamelTestSupport {
         session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         if (addSjmsComponent) {
             SjmsComponent component = new SjmsComponent();
-            component.setConnectionCount(1);
             component.setConnectionFactory(connectionFactory);
             camelContext.addComponent("sjms", component);
         }
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueInOutProducerTest.java
similarity index 80%
copy from components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
copy to components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueInOutProducerTest.java
index ee0f2c8..c876faa 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueInOutProducerTest.java
@@ -19,28 +19,27 @@ package org.apache.camel.component.sjms.tx;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
 import org.apache.camel.Processor;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.RollbackExchangeException;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.sjms.SjmsComponent;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class TransactedQueueProducerTest extends CamelTestSupport {
+public class TransactedQueueInOutProducerTest extends CamelTestSupport {
 
     @Produce
     protected ProducerTemplate template;
 
     @Test
     public void testRoute() throws Exception {
-
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedBodiesReceived("Hello World 2");
+        getMockEndpoint("mock:result").expectedBodiesReceived("Hello World 2");
+        getMockEndpoint("mock:result2").expectedBodiesReceived("Changed Hello World 2");
 
         try {
             template.sendBodyAndHeader("direct:start", "Hello World 1", "isfailed", true);
@@ -50,7 +49,7 @@ public class TransactedQueueProducerTest extends CamelTestSupport {
         }
         template.sendBodyAndHeader("direct:start", "Hello World 2", "isfailed", false);
 
-        mock.assertIsSatisfied();
+        assertMockEndpointsSatisfied();
     }
 
     @Override
@@ -69,9 +68,11 @@ public class TransactedQueueProducerTest extends CamelTestSupport {
         return new RouteBuilder() {
             @Override
             public void configure() {
-
                 from("direct:start")
                         .to("sjms:queue:test.queue?transacted=true")
+                        // request/reply is not transacted
+                        .to(ExchangePattern.InOut, "sjms:queue:test.transform")
+                        .to("sjms:queue:test.queue2?transacted=true")
                         .process(
                                 new Processor() {
                                     @Override
@@ -85,9 +86,14 @@ public class TransactedQueueProducerTest extends CamelTestSupport {
                                     }
                                 });
 
-                from("sjms:queue:test.queue?durableSubscriptionId=bar&transacted=true")
+                from("sjms:queue:test.queue?transacted=true")
                         .to("mock:result");
 
+                from("sjms:queue:test.queue2?transacted=true")
+                        .to("mock:result2");
+
+                from("sjms:queue:test.transform")
+                        .transform(body().prepend("Changed "));
             }
         };
     }
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
index ee0f2c8..fe2184b 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.RollbackExchangeException;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.sjms.SjmsComponent;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
@@ -38,9 +37,8 @@ public class TransactedQueueProducerTest extends CamelTestSupport {
 
     @Test
     public void testRoute() throws Exception {
-
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedBodiesReceived("Hello World 2");
+        getMockEndpoint("mock:result").expectedBodiesReceived("Hello World 2");
+        getMockEndpoint("mock:result2").expectedBodiesReceived("Hello World 2");
 
         try {
             template.sendBodyAndHeader("direct:start", "Hello World 1", "isfailed", true);
@@ -50,7 +48,7 @@ public class TransactedQueueProducerTest extends CamelTestSupport {
         }
         template.sendBodyAndHeader("direct:start", "Hello World 2", "isfailed", false);
 
-        mock.assertIsSatisfied();
+        assertMockEndpointsSatisfied();
     }
 
     @Override
@@ -69,9 +67,9 @@ public class TransactedQueueProducerTest extends CamelTestSupport {
         return new RouteBuilder() {
             @Override
             public void configure() {
-
                 from("direct:start")
                         .to("sjms:queue:test.queue?transacted=true")
+                        .to("sjms:queue:test.queue2?transacted=true")
                         .process(
                                 new Processor() {
                                     @Override
@@ -85,9 +83,11 @@ public class TransactedQueueProducerTest extends CamelTestSupport {
                                     }
                                 });
 
-                from("sjms:queue:test.queue?durableSubscriptionId=bar&transacted=true")
+                from("sjms:queue:test.queue?transacted=true")
                         .to("mock:result");
 
+                from("sjms:queue:test.queue2?transacted=true")
+                        .to("mock:result2");
             }
         };
     }
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
index dea5a9e..3682237 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
@@ -85,7 +85,7 @@ public class TransactedTopicProducerTest extends JmsTestSupport {
                                     }
                                 });
 
-                from("sjms:topic:test.topic?durableSubscriptionId=bar&transacted=true")
+                from("sjms:topic:test.topic?durableSubscriptionName=bar&transacted=true")
                         .to("mock:result");
 
             }
diff --git a/components/camel-sjms2/pom.xml b/components/camel-sjms2/pom.xml
index e124b5e..9c19ee2 100644
--- a/components/camel-sjms2/pom.xml
+++ b/components/camel-sjms2/pom.xml
@@ -45,10 +45,6 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-sjms</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-pool</groupId>
-            <artifactId>commons-pool</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -91,6 +87,13 @@
             <artifactId>activemq-pool</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- artemis connection pool -->
+        <dependency>
+            <groupId>org.messaginghub</groupId>
+            <artifactId>pooled-jms</artifactId>
+            <version>1.2.1</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
diff --git a/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java b/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java
index 9ac71dc..2531990 100644
--- a/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java
+++ b/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java
@@ -20,13 +20,11 @@ public class Sjms2EndpointUriFactory extends org.apache.camel.support.component.
     private static final Set<String> PROPERTY_NAMES;
     private static final Set<String> SECRET_PROPERTY_NAMES;
     static {
-        Set<String> props = new HashSet<>(53);
-        props.add("includeSentJMSMessageID");
+        Set<String> props = new HashSet<>(49);
         props.add("asyncConsumer");
         props.add("mapJmsMessage");
         props.add("synchronous");
         props.add("includeAllJMSXProperties");
-        props.add("errorHandlerLogStackTrace");
         props.add("eagerLoadingOfProperties");
         props.add("timeToLive");
         props.add("bridgeErrorHandler");
@@ -47,12 +45,9 @@ public class Sjms2EndpointUriFactory extends org.apache.camel.support.component.
         props.add("lazyStartProducer");
         props.add("replyTo");
         props.add("replyToOverride");
-        props.add("errorHandlerLoggingLevel");
-        props.add("durableSubscriptionId");
         props.add("subscriptionId");
         props.add("exceptionHandler");
         props.add("shared");
-        props.add("connectionCount");
         props.add("explicitQosEnabled");
         props.add("transacted");
         props.add("autoStartup");
@@ -66,14 +61,15 @@ public class Sjms2EndpointUriFactory extends org.apache.camel.support.component.
         props.add("allowNullBody");
         props.add("replyToDeliveryPersistent");
         props.add("disableReplyTo");
+        props.add("clientId");
         props.add("recoveryInterval");
         props.add("exchangePattern");
         props.add("preserveMessageQos");
         props.add("replyToType");
-        props.add("testConnectionOnStartup");
         props.add("connectionFactory");
+        props.add("testConnectionOnStartup");
+        props.add("durableSubscriptionName");
         props.add("replyToSameDestinationAllowed");
-        props.add("sharedJMSSession");
         PROPERTY_NAMES = Collections.unmodifiableSet(props);
         SECRET_PROPERTY_NAMES = Collections.emptySet();
     }
diff --git a/components/camel-sjms2/src/generated/resources/org/apache/camel/component/sjms2/sjms2.json b/components/camel-sjms2/src/generated/resources/org/apache/camel/component/sjms2/sjms2.json
index 4fe444a..733580a 100644
--- a/components/camel-sjms2/src/generated/resources/org/apache/camel/component/sjms2/sjms2.json
+++ b/components/camel-sjms2/src/generated/resources/org/apache/camel/component/sjms2/sjms2.json
@@ -22,8 +22,7 @@
     "lenientProperties": false
   },
   "componentProperties": {
-    "connectionCount": { "kind": "property", "displayName": "Connection Count", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "description": "The maximum number of connections available to endpoints started under this component" },
-    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": true, "secret": false, "description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource." },
+    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": true, "secret": false, "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
     "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
     "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
@@ -33,23 +32,23 @@
     "recoveryInterval": { "kind": "property", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
     "replyToOnTimeoutMaxConcurrentConsumers": { "kind": "property", "displayName": "Reply To On Timeout Max Concurrent Consumers", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request\/reply over JMS." },
     "requestTimeoutCheckerInterval": { "kind": "property", "displayName": "Request Timeout Checker Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Configures how often Camel should check for timed out Exchanges when doing request\/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeou [...]
-    "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
-    "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
-    "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }
+    "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." }
   },
   "properties": {
     "destinationType": { "kind": "path", "displayName": "Destination Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "queue", "topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "queue", "description": "The kind of destination to use" },
     "destinationName": { "kind": "path", "displayName": "Destination Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "DestinationName is a JMS queue or topic name. By default, the destinationName is interpreted as a queue name." },
     "acknowledgementMode": { "kind": "parameter", "displayName": "Acknowledgement Mode", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.SessionAcknowledgementType", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "description": "The JMS acknowledgement name, which is one of:  [...]
+    "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
     "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from  [...]
     "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
     "testConnectionOnStartup": { "kind": "parameter", "displayName": "Test Connection On Startup", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel [...]
     "asyncConsumer": { "kind": "parameter", "displayName": "Async Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asy [...]
     "autoStartup": { "kind": "parameter", "displayName": "Auto Startup", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether the consumer container should auto-startup." },
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
+    "clientId": { "kind": "parameter", "displayName": "Client Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may pref [...]
     "concurrentConsumers": { "kind": "parameter", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the default number of concurrent consumers when consuming from JMS (not for request\/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up\/down of threads. When doing r [...]
     "durable": { "kind": "parameter", "displayName": "Durable", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets topic consumer to durable." },
-    "durableSubscriptionId": { "kind": "parameter", "displayName": "Durable Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the durable subscription Id required for durable topics." },
+    "durableSubscriptionName": { "kind": "parameter", "displayName": "Durable Subscription Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configured as well." },
     "replyToDeliveryPersistent": { "kind": "parameter", "displayName": "Reply To Delivery Persistent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to use persistent delivery by default for replies." },
     "shared": { "kind": "parameter", "displayName": "Shared", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets the consumer to shared." },
     "subscriptionId": { "kind": "parameter", "displayName": "Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the subscription Id, required for durable or shared topics." },
@@ -61,22 +60,19 @@
     "replyToSameDestinationAllowed": { "kind": "parameter", "displayName": "Reply To Same Destination Allowed", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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 c [...]
     "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2." },
     "deliveryPersistent": { "kind": "parameter", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether persistent delivery is used by default." },
-    "explicitQosEnabled": { "kind": "parameter", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "description": "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 timeToLi [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
-    "preserveMessageQos": { "kind": "parameter", "displayName": "Preserve Message Qos", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDelive [...]
     "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "description": "Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in orde [...]
     "replyToConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the default number of concurrent consumers when doing request\/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up\/down of threads." },
     "replyToOverride": { "kind": "parameter", "displayName": "Reply To Override", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination." },
-    "replyToType": { "kind": "parameter", "displayName": "Reply To Type", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.ReplyToType", "enum": [ "Temporary", "Exclusive" ], "deprecated": false, "autowired": false, "secret": false, "description": "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 Exclusi [...]
+    "replyToType": { "kind": "parameter", "displayName": "Reply To Type", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.ReplyToType", "enum": [ "Temporary", "Exclusive" ], "deprecated": false, "autowired": false, "secret": false, "description": "Allows for explicitly specifying which kind of strategy to use for replyTo queues when doing request\/reply over JMS. Possible values are: Temporary or Exclusive. By de [...]
     "requestTimeout": { "kind": "parameter", "displayName": "Request Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "20000", "description": "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 timeou [...]
     "timeToLive": { "kind": "parameter", "displayName": "Time To Live", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "description": "When sending messages, specifies the time-to-live of the message (in milliseconds)." },
     "allowNullBody": { "kind": "parameter", "displayName": "Allow Null Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an JMSException is thrown." },
     "disableTimeToLive": { "kind": "parameter", "displayName": "Disable Time To Live", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Use this option to force disabling time to live. For example when you do request\/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message  [...]
-    "includeSentJMSMessageID": { "kind": "parameter", "displayName": "Include Sent JMSMessage ID", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was  [...]
+    "explicitQosEnabled": { "kind": "parameter", "displayName": "Explicit Qos Enabled", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "description": "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, p [...]
+    "preserveMessageQos": { "kind": "parameter", "displayName": "Preserve Message Qos", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JM [...]
     "asyncStartListener": { "kind": "parameter", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/o [...]
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to stop the consumer message listener asynchronously, when stopping a route." },
-    "connectionCount": { "kind": "parameter", "displayName": "Connection Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "description": "The maximum number of connections available to this endpoint" },
-    "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any" },
     "destinationCreationStrategy": { "kind": "parameter", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
     "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
@@ -87,9 +83,6 @@
     "recoveryInterval": { "kind": "parameter", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
     "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client i [...]
-    "errorHandlerLoggingLevel": { "kind": "parameter", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "description": "Allows to configure the default errorHandler logging level for logging uncaught exceptions." },
-    "errorHandlerLogStackTrace": { "kind": "parameter", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Allows to control whether stacktraces should be logged or not, by the default errorHandler." },
-    "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to use transacted mode" },
-    "sharedJMSSession": { "kind": "parameter", "displayName": "Shared JMSSession", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS provi [...]
+    "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to use transacted mode" }
   }
 }
diff --git a/components/camel-sjms2/src/main/docs/sjms2-component.adoc b/components/camel-sjms2/src/main/docs/sjms2-component.adoc
index a638296..d589102 100644
--- a/components/camel-sjms2/src/main/docs/sjms2-component.adoc
+++ b/components/camel-sjms2/src/main/docs/sjms2-component.adoc
@@ -79,15 +79,14 @@ You append query options to the URI using the following format,
 == Component Options and Configurations
 
 // component options: START
-The Simple JMS2 component supports 14 options, which are listed below.
+The Simple JMS2 component supports 11 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *connectionCount* (common) | The maximum number of connections available to endpoints started under this component | 1 | Integer
-| *connectionFactory* (common) | *Autowired* A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource. |  | ConnectionFactory
+| *connectionFactory* (common) | *Autowired* The connection factory to be use. A connection factory must be configured either on the component or endpoint. |  | ConnectionFactory
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
@@ -98,8 +97,6 @@ The Simple JMS2 component supports 14 options, which are listed below.
 | *replyToOnTimeoutMaxConcurrent{zwsp}Consumers* (advanced) | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS. | 1 | int
 | *requestTimeoutCheckerInterval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
-| *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
-| *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 |===
 // component options: END
 
@@ -124,22 +121,24 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (51 parameters):
+=== Query Parameters (47 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *acknowledgementMode* (common) | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. There are 4 enums and the value can be one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | SessionAcknowledgementType
+| *connectionFactory* (common) | The connection factory to be use. A connection factory must be configured either on the component or endpoint. |  | ConnectionFactory
 | *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message broker [...]
 | *replyTo* (common) | Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer). |  | String
 | *testConnectionOnStartup* (common) | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | boolean
 | *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100% strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transac [...]
 | *autoStartup* (consumer) | Specifies whether the consumer container should auto-startup. | true | boolean
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
+| *clientId* (consumer) | Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics instead. |  | String
 | *concurrentConsumers* (consumer) | Specifies the default number of concurrent consumers when consuming from JMS (not for request/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. When doing request/reply over JMS then the option replyToConcurrentConsumers is used to control number of concurrent consumers on the reply message listener. | 1 | int
 | *durable* (consumer) | Sets topic consumer to durable. | false | boolean
-| *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
+| *durableSubscriptionName* (consumer) | The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configured as well. |  | String
 | *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
 | *shared* (consumer) | Sets the consumer to shared. | false | boolean
 | *subscriptionId* (consumer) | Sets the subscription Id, required for durable or shared topics. |  | String
@@ -151,22 +150,19 @@ with the following path and query parameters:
 | *replyToSameDestinationAllowed* (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
 | *deliveryMode* (producer) | Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2. There are 2 enums and the value can be one of: 1, 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
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
 | *replyToConcurrentConsumers* (producer) | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. | 1 | int
 | *replyToOverride* (producer) | Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination. |  | String
-| *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  [...]
+| *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 or Exclusive. By default Camel will use temporary queues. However if replyTo has been configured, then Exclusive is used. There are 2 enums and the value can be one of: Temporary, 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
 | *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
 | *disableTimeToLive* (producer) | Use this option to force disabling time to live. For example when you do request/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message being sent. The problem is that the sender and receiver systems have to have their clocks synchronized, so they are in sync. This is not always so easy to archive. So you can use disableTimeToLive=true to not set a time to live value on the sent message. Then the message w [...]
-| *includeSentJMSMessageID* (producer) | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination. | false | 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
+| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
-| *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
-| *connectionFactory* (advanced) | Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any |  | ConnectionFactory
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *exceptionListener* (advanced) | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. |  | ExceptionListener
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
@@ -177,10 +173,7 @@ with the following path and query parameters:
 | *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
-| *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
-| *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
-| *sharedJMSSession* (transaction) | Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS providers, use jms component to leverage XA transaction. | true | boolean
 |===
 // endpoint options: END
 
diff --git a/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/Sjms2Endpoint.java b/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/Sjms2Endpoint.java
index e1a2e89..1902517 100644
--- a/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/Sjms2Endpoint.java
+++ b/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/Sjms2Endpoint.java
@@ -33,11 +33,11 @@ import org.apache.camel.spi.UriParam;
              syntax = "sjms2:destinationType:destinationName", category = { Category.MESSAGING })
 public class Sjms2Endpoint extends SjmsEndpoint implements AsyncEndpoint {
 
-    @UriParam(label = "consumer")
+    @UriParam(label = "consumer", description = "Sets the subscription Id, required for durable or shared topics.")
     private String subscriptionId;
-    @UriParam(label = "consumer")
+    @UriParam(label = "consumer", description = "Sets topic consumer to durable.")
     private boolean durable;
-    @UriParam(label = "consumer")
+    @UriParam(label = "consumer", description = "Sets the consumer to shared.")
     private boolean shared;
 
     public Sjms2Endpoint() {
@@ -53,12 +53,9 @@ public class Sjms2Endpoint extends SjmsEndpoint implements AsyncEndpoint {
         return (Sjms2Component) super.getComponent();
     }
 
-    /**
-     * Sets the durable subscription Id required for durable topics.
-     */
     @Override
-    public void setDurableSubscriptionId(String durableSubscriptionId) {
-        super.setDurableSubscriptionId(durableSubscriptionId);
+    public void setDurableSubscriptionName(String durableSubscriptionId) {
+        super.setDurableSubscriptionName(durableSubscriptionId);
         subscriptionId = durableSubscriptionId;
         durable = true;
     }
@@ -67,9 +64,6 @@ public class Sjms2Endpoint extends SjmsEndpoint implements AsyncEndpoint {
         return subscriptionId;
     }
 
-    /**
-     * Sets the subscription Id, required for durable or shared topics.
-     */
     public void setSubscriptionId(String subscriptionId) {
         this.subscriptionId = subscriptionId;
     }
@@ -78,9 +72,6 @@ public class Sjms2Endpoint extends SjmsEndpoint implements AsyncEndpoint {
         return durable;
     }
 
-    /**
-     * Sets topic consumer to durable.
-     */
     public void setDurable(boolean durable) {
         this.durable = durable;
     }
@@ -89,9 +80,6 @@ public class Sjms2Endpoint extends SjmsEndpoint implements AsyncEndpoint {
         return shared;
     }
 
-    /**
-     * Sets the consumer to shared.
-     */
     public void setShared(boolean shared) {
         this.shared = shared;
     }
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointNameOverrideTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointNameOverrideTest.java
index a9ea8d6..9fd58c3 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointNameOverrideTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointNameOverrideTest.java
@@ -69,7 +69,6 @@ public class Sjms2EndpointNameOverrideTest extends CamelTestSupport {
         ActiveMQConnectionFactory connectionFactory
                 = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
         Sjms2Component component = new Sjms2Component();
-        component.setConnectionCount(1);
         component.setConnectionFactory(connectionFactory);
         camelContext.addComponent(BEAN_NAME, component);
 
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java
index fa9f377..5e9a8c8 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java
@@ -93,7 +93,6 @@ public class Sjms2EndpointTest extends CamelTestSupport {
             Sjms2Endpoint sjms = (Sjms2Endpoint) context.getEndpoint("sjms2:queue:test");
             assertNotNull(sjms);
             assertEquals(ExchangePattern.InOnly, sjms.getExchangePattern());
-            // assertTrue(sjms.createExchange().getPattern().equals(ExchangePattern.InOnly));
         } catch (Exception e) {
             fail("Exception thrown: " + e.getLocalizedMessage());
         }
@@ -149,7 +148,6 @@ public class Sjms2EndpointTest extends CamelTestSupport {
         ActiveMQConnectionFactory connectionFactory
                 = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
         Sjms2Component component = new Sjms2Component();
-        component.setConnectionCount(3);
         component.setConnectionFactory(connectionFactory);
         camelContext.addComponent("sjms2", component);
 
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java
index 73a41cd..b38747c 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java
@@ -20,10 +20,11 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.sjms2.Sjms2Component;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.component.sjms2.support.Jms2TestSupport;
 import org.junit.jupiter.api.Test;
+import org.messaginghub.pooled.jms.JmsPoolConnectionFactory;
 
-public class InOnlyTopicDurableConsumerTest extends CamelTestSupport {
+public class InOnlyTopicDurableConsumerTest extends Jms2TestSupport {
 
     private static final String CONNECTION_ID = "test-connection-1";
 
@@ -52,7 +53,13 @@ public class InOnlyTopicDurableConsumerTest extends CamelTestSupport {
     protected CamelContext createCamelContext() throws Exception {
         CamelContext context = super.createCamelContext();
         Sjms2Component sjms = context.getComponent("sjms2", Sjms2Component.class);
+
+        // need to use a pooled CF so we reuse same connection for multiple client connections
+        JmsPoolConnectionFactory pcf = new JmsPoolConnectionFactory();
+        pcf.setConnectionFactory(sjms.getConnectionFactory());
+        sjms.setConnectionFactory(pcf);
         sjms.setClientId(CONNECTION_ID);
+
         return context;
     }
 
@@ -61,10 +68,10 @@ public class InOnlyTopicDurableConsumerTest extends CamelTestSupport {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("sjms2:topic:foo?durableSubscriptionId=bar1")
+                from("sjms2:topic:foo?durableSubscriptionName=bar1")
                         .to("mock:result");
 
-                from("sjms2:topic:foo?durableSubscriptionId=bar2")
+                from("sjms2:topic:foo?durableSubscriptionName=bar2")
                         .to("mock:result2");
             }
         };
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java
index 851ed58..33f0b5c 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java
@@ -130,7 +130,6 @@ public class Jms2TestSupport extends CamelTestSupport {
         connection.start();
         session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         Sjms2Component component = new Sjms2Component();
-        component.setConnectionCount(1);
         component.setConnectionFactory(connectionFactory);
         camelContext.addComponent("sjms2", component);
         return camelContext;
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java
index 6e01843..f9e8a93 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java
@@ -51,25 +51,8 @@ public interface Sjms2ComponentBuilderFactory {
      */
     interface Sjms2ComponentBuilder extends ComponentBuilder<Sjms2Component> {
         /**
-         * The maximum number of connections available to endpoints started
-         * under this component.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Default: 1
-         * Group: common
-         * 
-         * @param connectionCount the value to set
-         * @return the dsl builder
-         */
-        default Sjms2ComponentBuilder connectionCount(
-                java.lang.Integer connectionCount) {
-            doSetProperty("connectionCount", connectionCount);
-            return this;
-        }
-        /**
-         * A ConnectionFactory is required to enable the SjmsComponent. It can
-         * be set directly or set set as part of a ConnectionResource.
+         * The connection factory to be use. A connection factory must be
+         * configured either on the component or endpoint.
          * 
          * The option is a: &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt;
          * type.
@@ -279,36 +262,6 @@ public interface Sjms2ComponentBuilderFactory {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
-        /**
-         * Password to use with the ConnectionFactory. You can also configure
-         * username/password directly on the ConnectionFactory.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: security
-         * 
-         * @param password the value to set
-         * @return the dsl builder
-         */
-        default Sjms2ComponentBuilder password(java.lang.String password) {
-            doSetProperty("password", password);
-            return this;
-        }
-        /**
-         * Username to use with the ConnectionFactory. You can also configure
-         * username/password directly on the ConnectionFactory.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: security
-         * 
-         * @param username the value to set
-         * @return the dsl builder
-         */
-        default Sjms2ComponentBuilder username(java.lang.String username) {
-            doSetProperty("username", username);
-            return this;
-        }
     }
 
     class Sjms2ComponentBuilderImpl
@@ -326,7 +279,6 @@ public interface Sjms2ComponentBuilderFactory {
                 String name,
                 Object value) {
             switch (name) {
-            case "connectionCount": ((Sjms2Component) component).setConnectionCount((java.lang.Integer) value); return true;
             case "connectionFactory": ((Sjms2Component) component).setConnectionFactory((javax.jms.ConnectionFactory) value); return true;
             case "bridgeErrorHandler": ((Sjms2Component) component).setBridgeErrorHandler((boolean) value); return true;
             case "lazyStartProducer": ((Sjms2Component) component).setLazyStartProducer((boolean) value); return true;
@@ -338,8 +290,6 @@ public interface Sjms2ComponentBuilderFactory {
             case "replyToOnTimeoutMaxConcurrentConsumers": ((Sjms2Component) component).setReplyToOnTimeoutMaxConcurrentConsumers((int) value); return true;
             case "requestTimeoutCheckerInterval": ((Sjms2Component) component).setRequestTimeoutCheckerInterval((long) value); return true;
             case "headerFilterStrategy": ((Sjms2Component) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
-            case "password": ((Sjms2Component) component).setPassword((java.lang.String) value); return true;
-            case "username": ((Sjms2Component) component).setUsername((java.lang.String) value); return true;
             default: return false;
             }
         }
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java
index 7d64cd5..a9e1d59 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java
@@ -51,25 +51,8 @@ public interface SjmsComponentBuilderFactory {
      */
     interface SjmsComponentBuilder extends ComponentBuilder<SjmsComponent> {
         /**
-         * The maximum number of connections available to endpoints started
-         * under this component.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Default: 1
-         * Group: common
-         * 
-         * @param connectionCount the value to set
-         * @return the dsl builder
-         */
-        default SjmsComponentBuilder connectionCount(
-                java.lang.Integer connectionCount) {
-            doSetProperty("connectionCount", connectionCount);
-            return this;
-        }
-        /**
-         * A ConnectionFactory is required to enable the SjmsComponent. It can
-         * be set directly or set set as part of a ConnectionResource.
+         * The connection factory to be use. A connection factory must be
+         * configured either on the component or endpoint.
          * 
          * The option is a: &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt;
          * type.
@@ -278,36 +261,6 @@ public interface SjmsComponentBuilderFactory {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
-        /**
-         * Password to use with the ConnectionFactory. You can also configure
-         * username/password directly on the ConnectionFactory.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: security
-         * 
-         * @param password the value to set
-         * @return the dsl builder
-         */
-        default SjmsComponentBuilder password(java.lang.String password) {
-            doSetProperty("password", password);
-            return this;
-        }
-        /**
-         * Username to use with the ConnectionFactory. You can also configure
-         * username/password directly on the ConnectionFactory.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: security
-         * 
-         * @param username the value to set
-         * @return the dsl builder
-         */
-        default SjmsComponentBuilder username(java.lang.String username) {
-            doSetProperty("username", username);
-            return this;
-        }
     }
 
     class SjmsComponentBuilderImpl
@@ -325,7 +278,6 @@ public interface SjmsComponentBuilderFactory {
                 String name,
                 Object value) {
             switch (name) {
-            case "connectionCount": ((SjmsComponent) component).setConnectionCount((java.lang.Integer) value); return true;
             case "connectionFactory": ((SjmsComponent) component).setConnectionFactory((javax.jms.ConnectionFactory) value); return true;
             case "bridgeErrorHandler": ((SjmsComponent) component).setBridgeErrorHandler((boolean) value); return true;
             case "lazyStartProducer": ((SjmsComponent) component).setLazyStartProducer((boolean) value); return true;
@@ -337,8 +289,6 @@ public interface SjmsComponentBuilderFactory {
             case "replyToOnTimeoutMaxConcurrentConsumers": ((SjmsComponent) component).setReplyToOnTimeoutMaxConcurrentConsumers((int) value); return true;
             case "requestTimeoutCheckerInterval": ((SjmsComponent) component).setRequestTimeoutCheckerInterval((long) value); return true;
             case "headerFilterStrategy": ((SjmsComponent) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
-            case "password": ((SjmsComponent) component).setPassword((java.lang.String) value); return true;
-            case "username": ((SjmsComponent) component).setUsername((java.lang.String) value); return true;
             default: return false;
             }
         }
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java
index 1ea44be..06b69d8 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
 
 import javax.annotation.Generated;
 import org.apache.camel.ExchangePattern;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
@@ -81,6 +80,40 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
+         * The connection factory to be use. A connection factory must be
+         * configured either on the component or endpoint.
+         * 
+         * The option is a: &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt;
+         * type.
+         * 
+         * Group: common
+         * 
+         * @param connectionFactory the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointConsumerBuilder connectionFactory(
+                Object connectionFactory) {
+            doSetProperty("connectionFactory", connectionFactory);
+            return this;
+        }
+        /**
+         * The connection factory to be use. A connection factory must be
+         * configured either on the component or endpoint.
+         * 
+         * The option will be converted to a
+         * &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt; type.
+         * 
+         * Group: common
+         * 
+         * @param connectionFactory the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointConsumerBuilder connectionFactory(
+                String connectionFactory) {
+            doSetProperty("connectionFactory", connectionFactory);
+            return this;
+        }
+        /**
          * Specifies whether Camel ignores the JMSReplyTo header in messages. If
          * true, Camel does not send a reply back to the destination specified
          * in the JMSReplyTo header. You can use this option if you want Camel
@@ -309,6 +342,24 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
+         * Sets the JMS client ID to use. Note that this value, if specified,
+         * must be unique and can only be used by a single JMS connection
+         * instance. It is typically only required for durable topic
+         * subscriptions. If using Apache ActiveMQ you may prefer to use Virtual
+         * Topics instead.
+         * 
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
+         * 
+         * Group: consumer
+         * 
+         * @param clientId the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointConsumerBuilder clientId(String clientId) {
+            doSetProperty("clientId", clientId);
+            return this;
+        }
+        /**
          * Specifies the default number of concurrent consumers when consuming
          * from JMS (not for request/reply over JMS). See also the
          * maxMessagesPerTask option to control dynamic scaling up/down of
@@ -382,18 +433,19 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
-         * Sets the durable subscription Id required for durable topics.
+         * The durable subscriber name for specifying durable topic
+         * subscriptions. The clientId option must be configured as well.
          * 
          * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: consumer
          * 
-         * @param durableSubscriptionId the value to set
+         * @param durableSubscriptionName the value to set
          * @return the dsl builder
          */
-        default Sjms2EndpointConsumerBuilder durableSubscriptionId(
-                String durableSubscriptionId) {
-            doSetProperty("durableSubscriptionId", durableSubscriptionId);
+        default Sjms2EndpointConsumerBuilder durableSubscriptionName(
+                String durableSubscriptionName) {
+            doSetProperty("durableSubscriptionName", durableSubscriptionName);
             return this;
         }
         /**
@@ -476,77 +528,6 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
-         * Allows to configure the default errorHandler logging level for
-         * logging uncaught exceptions.
-         * 
-         * The option is a:
-         * &lt;code&gt;org.apache.camel.LoggingLevel&lt;/code&gt; type.
-         * 
-         * Default: WARN
-         * Group: logging
-         * 
-         * @param errorHandlerLoggingLevel the value to set
-         * @return the dsl builder
-         */
-        default Sjms2EndpointConsumerBuilder errorHandlerLoggingLevel(
-                LoggingLevel errorHandlerLoggingLevel) {
-            doSetProperty("errorHandlerLoggingLevel", errorHandlerLoggingLevel);
-            return this;
-        }
-        /**
-         * Allows to configure the default errorHandler logging level for
-         * logging uncaught exceptions.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.LoggingLevel&lt;/code&gt; type.
-         * 
-         * Default: WARN
-         * Group: logging
-         * 
-         * @param errorHandlerLoggingLevel the value to set
-         * @return the dsl builder
-         */
-        default Sjms2EndpointConsumerBuilder errorHandlerLoggingLevel(
-                String errorHandlerLoggingLevel) {
-            doSetProperty("errorHandlerLoggingLevel", errorHandlerLoggingLevel);
-            return this;
-        }
-        /**
-         * Allows to control whether stacktraces should be logged or not, by the
-         * default errorHandler.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: logging
-         * 
-         * @param errorHandlerLogStackTrace the value to set
-         * @return the dsl builder
-         */
-        default Sjms2EndpointConsumerBuilder errorHandlerLogStackTrace(
-                boolean errorHandlerLogStackTrace) {
-            doSetProperty("errorHandlerLogStackTrace", errorHandlerLogStackTrace);
-            return this;
-        }
-        /**
-         * Allows to control whether stacktraces should be logged or not, by the
-         * default errorHandler.
-         * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
-         * 
-         * Default: true
-         * Group: logging
-         * 
-         * @param errorHandlerLogStackTrace the value to set
-         * @return the dsl builder
-         */
-        default Sjms2EndpointConsumerBuilder errorHandlerLogStackTrace(
-                String errorHandlerLogStackTrace) {
-            doSetProperty("errorHandlerLogStackTrace", errorHandlerLogStackTrace);
-            return this;
-        }
-        /**
          * Specifies whether to use transacted mode.
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
@@ -861,73 +842,6 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
-         * The maximum number of connections available to this endpoint.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default AdvancedSjms2EndpointConsumerBuilder connectionCount(
-                Integer connectionCount) {
-            doSetProperty("connectionCount", connectionCount);
-            return this;
-        }
-        /**
-         * The maximum number of connections available to this endpoint.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default AdvancedSjms2EndpointConsumerBuilder connectionCount(
-                String connectionCount) {
-            doSetProperty("connectionCount", connectionCount);
-            return this;
-        }
-        /**
-         * Initializes the connectionFactory for the endpoint, which takes
-         * precedence over the component's connectionFactory, if any.
-         * 
-         * The option is a: &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt;
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionFactory the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointConsumerBuilder connectionFactory(
-                Object connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
-         * Initializes the connectionFactory for the endpoint, which takes
-         * precedence over the component's connectionFactory, if any.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionFactory the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointConsumerBuilder connectionFactory(
-                String connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
          * To use a custom DestinationCreationStrategy.
          * 
          * The option is a:
@@ -1319,45 +1233,6 @@ public interface Sjms2EndpointBuilderFactory {
             doSetProperty("transferException", transferException);
             return this;
         }
-        /**
-         * Specifies whether to share JMS session with other SJMS endpoints.
-         * Turn this off if your route is accessing to multiple JMS providers.
-         * If you need transaction against multiple JMS providers, use jms
-         * component to leverage XA transaction.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: transaction (advanced)
-         * 
-         * @param sharedJMSSession the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointConsumerBuilder sharedJMSSession(
-                boolean sharedJMSSession) {
-            doSetProperty("sharedJMSSession", sharedJMSSession);
-            return this;
-        }
-        /**
-         * Specifies whether to share JMS session with other SJMS endpoints.
-         * Turn this off if your route is accessing to multiple JMS providers.
-         * If you need transaction against multiple JMS providers, use jms
-         * component to leverage XA transaction.
-         * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
-         * 
-         * Default: true
-         * Group: transaction (advanced)
-         * 
-         * @param sharedJMSSession the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointConsumerBuilder sharedJMSSession(
-                String sharedJMSSession) {
-            doSetProperty("sharedJMSSession", sharedJMSSession);
-            return this;
-        }
     }
 
     /**
@@ -1406,6 +1281,40 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
+         * The connection factory to be use. A connection factory must be
+         * configured either on the component or endpoint.
+         * 
+         * The option is a: &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt;
+         * type.
+         * 
+         * Group: common
+         * 
+         * @param connectionFactory the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder connectionFactory(
+                Object connectionFactory) {
+            doSetProperty("connectionFactory", connectionFactory);
+            return this;
+        }
+        /**
+         * The connection factory to be use. A connection factory must be
+         * configured either on the component or endpoint.
+         * 
+         * The option will be converted to a
+         * &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt; type.
+         * 
+         * Group: common
+         * 
+         * @param connectionFactory the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder connectionFactory(
+                String connectionFactory) {
+            doSetProperty("connectionFactory", connectionFactory);
+            return this;
+        }
+        /**
          * Specifies whether Camel ignores the JMSReplyTo header in messages. If
          * true, Camel does not send a reply back to the destination specified
          * in the JMSReplyTo header. You can use this option if you want Camel
@@ -1575,49 +1484,6 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
-         * 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.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: producer
-         * 
-         * @param explicitQosEnabled the value to set
-         * @return the dsl builder
-         */
-        default Sjms2EndpointProducerBuilder explicitQosEnabled(
-                Boolean explicitQosEnabled) {
-            doSetProperty("explicitQosEnabled", explicitQosEnabled);
-            return this;
-        }
-        /**
-         * 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.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: producer
-         * 
-         * @param explicitQosEnabled the value to set
-         * @return the dsl builder
-         */
-        default Sjms2EndpointProducerBuilder explicitQosEnabled(
-                String explicitQosEnabled) {
-            doSetProperty("explicitQosEnabled", explicitQosEnabled);
-            return this;
-        }
-        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -1667,55 +1533,6 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
-         * Set to true, if you want to send message using the QoS settings
-         * specified on the message, instead of the QoS settings on the JMS
-         * endpoint. The following three headers are considered JMSPriority,
-         * JMSDeliveryMode, and JMSExpiration. You can provide all or only some
-         * of them. If not provided, Camel will fall back to use the values from
-         * the endpoint instead. So, when using this option, the headers
-         * override the values from the endpoint. The explicitQosEnabled option,
-         * by contrast, will only use options set on the endpoint, and not
-         * values from the message header.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: producer
-         * 
-         * @param preserveMessageQos the value to set
-         * @return the dsl builder
-         */
-        default Sjms2EndpointProducerBuilder preserveMessageQos(
-                boolean preserveMessageQos) {
-            doSetProperty("preserveMessageQos", preserveMessageQos);
-            return this;
-        }
-        /**
-         * Set to true, if you want to send message using the QoS settings
-         * specified on the message, instead of the QoS settings on the JMS
-         * endpoint. The following three headers are considered JMSPriority,
-         * JMSDeliveryMode, and JMSExpiration. You can provide all or only some
-         * of them. If not provided, Camel will fall back to use the values from
-         * the endpoint instead. So, when using this option, the headers
-         * override the values from the endpoint. The explicitQosEnabled option,
-         * by contrast, will only use options set on the endpoint, and not
-         * values from the message header.
-         * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
-         * 
-         * Default: false
-         * Group: producer
-         * 
-         * @param preserveMessageQos the value to set
-         * @return the dsl builder
-         */
-        default Sjms2EndpointProducerBuilder preserveMessageQos(
-                String preserveMessageQos) {
-            doSetProperty("preserveMessageQos", preserveMessageQos);
-            return this;
-        }
-        /**
          * Values greater than 1 specify the message priority when sending
          * (where 1 is the lowest priority and 9 is the highest). The
          * explicitQosEnabled option must also be enabled in order for this
@@ -1808,13 +1625,9 @@ public interface Sjms2EndpointBuilderFactory {
         /**
          * 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.
+         * are: Temporary or Exclusive. By default Camel will use temporary
+         * queues. However if replyTo has been configured, then Exclusive is
+         * used.
          * 
          * The option is a:
          * &lt;code&gt;org.apache.camel.component.sjms.ReplyToType&lt;/code&gt;
@@ -1832,13 +1645,9 @@ public interface Sjms2EndpointBuilderFactory {
         /**
          * 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.
+         * are: Temporary or Exclusive. By default Camel will use temporary
+         * queues. However if replyTo has been configured, then Exclusive is
+         * used.
          * 
          * The option will be converted to a
          * &lt;code&gt;org.apache.camel.component.sjms.ReplyToType&lt;/code&gt;
@@ -2051,29 +1860,82 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
-         * Only applicable when sending to JMS destination using InOnly (eg fire
-         * and forget). Enabling this option will enrich the Camel Exchange with
-         * the actual JMSMessageID that was used by the JMS client when the
-         * message was sent to the JMS destination.
+         * 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.
+         * 
+         * The option is a: &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: producer (advanced)
+         * 
+         * @param explicitQosEnabled the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjms2EndpointProducerBuilder explicitQosEnabled(
+                Boolean explicitQosEnabled) {
+            doSetProperty("explicitQosEnabled", explicitQosEnabled);
+            return this;
+        }
+        /**
+         * 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.
+         * 
+         * The option will be converted to a
+         * &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: producer (advanced)
+         * 
+         * @param explicitQosEnabled the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjms2EndpointProducerBuilder explicitQosEnabled(
+                String explicitQosEnabled) {
+            doSetProperty("explicitQosEnabled", explicitQosEnabled);
+            return this;
+        }
+        /**
+         * Set to true, if you want to send message using the QoS settings
+         * specified on the message, instead of the QoS settings on the JMS
+         * endpoint. The following three headers are considered JMSPriority,
+         * JMSDeliveryMode, and JMSExpiration. You can provide all or only some
+         * of them. If not provided, Camel will fall back to use the values from
+         * the endpoint instead. So, when using this option, the headers
+         * override the values from the endpoint. The explicitQosEnabled option,
+         * by contrast, will only use options set on the endpoint, and not
+         * values from the message header.
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
          * Default: false
          * Group: producer (advanced)
          * 
-         * @param includeSentJMSMessageID the value to set
+         * @param preserveMessageQos the value to set
          * @return the dsl builder
          */
-        default AdvancedSjms2EndpointProducerBuilder includeSentJMSMessageID(
-                boolean includeSentJMSMessageID) {
-            doSetProperty("includeSentJMSMessageID", includeSentJMSMessageID);
+        default AdvancedSjms2EndpointProducerBuilder preserveMessageQos(
+                boolean preserveMessageQos) {
+            doSetProperty("preserveMessageQos", preserveMessageQos);
             return this;
         }
         /**
-         * Only applicable when sending to JMS destination using InOnly (eg fire
-         * and forget). Enabling this option will enrich the Camel Exchange with
-         * the actual JMSMessageID that was used by the JMS client when the
-         * message was sent to the JMS destination.
+         * Set to true, if you want to send message using the QoS settings
+         * specified on the message, instead of the QoS settings on the JMS
+         * endpoint. The following three headers are considered JMSPriority,
+         * JMSDeliveryMode, and JMSExpiration. You can provide all or only some
+         * of them. If not provided, Camel will fall back to use the values from
+         * the endpoint instead. So, when using this option, the headers
+         * override the values from the endpoint. The explicitQosEnabled option,
+         * by contrast, will only use options set on the endpoint, and not
+         * values from the message header.
          * 
          * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
          * type.
@@ -2081,12 +1943,12 @@ public interface Sjms2EndpointBuilderFactory {
          * Default: false
          * Group: producer (advanced)
          * 
-         * @param includeSentJMSMessageID the value to set
+         * @param preserveMessageQos the value to set
          * @return the dsl builder
          */
-        default AdvancedSjms2EndpointProducerBuilder includeSentJMSMessageID(
-                String includeSentJMSMessageID) {
-            doSetProperty("includeSentJMSMessageID", includeSentJMSMessageID);
+        default AdvancedSjms2EndpointProducerBuilder preserveMessageQos(
+                String preserveMessageQos) {
+            doSetProperty("preserveMessageQos", preserveMessageQos);
             return this;
         }
         /**
@@ -2176,73 +2038,6 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
-         * The maximum number of connections available to this endpoint.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default AdvancedSjms2EndpointProducerBuilder connectionCount(
-                Integer connectionCount) {
-            doSetProperty("connectionCount", connectionCount);
-            return this;
-        }
-        /**
-         * The maximum number of connections available to this endpoint.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default AdvancedSjms2EndpointProducerBuilder connectionCount(
-                String connectionCount) {
-            doSetProperty("connectionCount", connectionCount);
-            return this;
-        }
-        /**
-         * Initializes the connectionFactory for the endpoint, which takes
-         * precedence over the component's connectionFactory, if any.
-         * 
-         * The option is a: &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt;
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionFactory the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointProducerBuilder connectionFactory(
-                Object connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
-         * Initializes the connectionFactory for the endpoint, which takes
-         * precedence over the component's connectionFactory, if any.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionFactory the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointProducerBuilder connectionFactory(
-                String connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
          * To use a custom DestinationCreationStrategy.
          * 
          * The option is a:
@@ -2634,45 +2429,6 @@ public interface Sjms2EndpointBuilderFactory {
             doSetProperty("transferException", transferException);
             return this;
         }
-        /**
-         * Specifies whether to share JMS session with other SJMS endpoints.
-         * Turn this off if your route is accessing to multiple JMS providers.
-         * If you need transaction against multiple JMS providers, use jms
-         * component to leverage XA transaction.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: transaction (advanced)
-         * 
-         * @param sharedJMSSession the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointProducerBuilder sharedJMSSession(
-                boolean sharedJMSSession) {
-            doSetProperty("sharedJMSSession", sharedJMSSession);
-            return this;
-        }
-        /**
-         * Specifies whether to share JMS session with other SJMS endpoints.
-         * Turn this off if your route is accessing to multiple JMS providers.
-         * If you need transaction against multiple JMS providers, use jms
-         * component to leverage XA transaction.
-         * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
-         * 
-         * Default: true
-         * Group: transaction (advanced)
-         * 
-         * @param sharedJMSSession the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointProducerBuilder sharedJMSSession(
-                String sharedJMSSession) {
-            doSetProperty("sharedJMSSession", sharedJMSSession);
-            return this;
-        }
     }
 
     /**
@@ -2722,6 +2478,38 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
+         * The connection factory to be use. A connection factory must be
+         * configured either on the component or endpoint.
+         * 
+         * The option is a: &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt;
+         * type.
+         * 
+         * Group: common
+         * 
+         * @param connectionFactory the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointBuilder connectionFactory(Object connectionFactory) {
+            doSetProperty("connectionFactory", connectionFactory);
+            return this;
+        }
+        /**
+         * The connection factory to be use. A connection factory must be
+         * configured either on the component or endpoint.
+         * 
+         * The option will be converted to a
+         * &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt; type.
+         * 
+         * Group: common
+         * 
+         * @param connectionFactory the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointBuilder connectionFactory(String connectionFactory) {
+            doSetProperty("connectionFactory", connectionFactory);
+            return this;
+        }
+        /**
          * Specifies whether Camel ignores the JMSReplyTo header in messages. If
          * true, Camel does not send a reply back to the destination specified
          * in the JMSReplyTo header. You can use this option if you want Camel
@@ -2952,73 +2740,6 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
-         * The maximum number of connections available to this endpoint.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default AdvancedSjms2EndpointBuilder connectionCount(
-                Integer connectionCount) {
-            doSetProperty("connectionCount", connectionCount);
-            return this;
-        }
-        /**
-         * The maximum number of connections available to this endpoint.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default AdvancedSjms2EndpointBuilder connectionCount(
-                String connectionCount) {
-            doSetProperty("connectionCount", connectionCount);
-            return this;
-        }
-        /**
-         * Initializes the connectionFactory for the endpoint, which takes
-         * precedence over the component's connectionFactory, if any.
-         * 
-         * The option is a: &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt;
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionFactory the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointBuilder connectionFactory(
-                Object connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
-         * Initializes the connectionFactory for the endpoint, which takes
-         * precedence over the component's connectionFactory, if any.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionFactory the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointBuilder connectionFactory(
-                String connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
          * To use a custom DestinationCreationStrategy.
          * 
          * The option is a:
@@ -3406,45 +3127,6 @@ public interface Sjms2EndpointBuilderFactory {
             doSetProperty("transferException", transferException);
             return this;
         }
-        /**
-         * Specifies whether to share JMS session with other SJMS endpoints.
-         * Turn this off if your route is accessing to multiple JMS providers.
-         * If you need transaction against multiple JMS providers, use jms
-         * component to leverage XA transaction.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: transaction (advanced)
-         * 
-         * @param sharedJMSSession the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointBuilder sharedJMSSession(
-                boolean sharedJMSSession) {
-            doSetProperty("sharedJMSSession", sharedJMSSession);
-            return this;
-        }
-        /**
-         * Specifies whether to share JMS session with other SJMS endpoints.
-         * Turn this off if your route is accessing to multiple JMS providers.
-         * If you need transaction against multiple JMS providers, use jms
-         * component to leverage XA transaction.
-         * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
-         * 
-         * Default: true
-         * Group: transaction (advanced)
-         * 
-         * @param sharedJMSSession the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointBuilder sharedJMSSession(
-                String sharedJMSSession) {
-            doSetProperty("sharedJMSSession", sharedJMSSession);
-            return this;
-        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java
index 69e6025..d153a6e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
 
 import javax.annotation.Generated;
 import org.apache.camel.ExchangePattern;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
@@ -81,6 +80,40 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
+         * The connection factory to be use. A connection factory must be
+         * configured either on the component or endpoint.
+         * 
+         * The option is a: &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt;
+         * type.
+         * 
+         * Group: common
+         * 
+         * @param connectionFactory the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointConsumerBuilder connectionFactory(
+                Object connectionFactory) {
+            doSetProperty("connectionFactory", connectionFactory);
+            return this;
+        }
+        /**
+         * The connection factory to be use. A connection factory must be
+         * configured either on the component or endpoint.
+         * 
+         * The option will be converted to a
+         * &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt; type.
+         * 
+         * Group: common
+         * 
+         * @param connectionFactory the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointConsumerBuilder connectionFactory(
+                String connectionFactory) {
+            doSetProperty("connectionFactory", connectionFactory);
+            return this;
+        }
+        /**
          * Specifies whether Camel ignores the JMSReplyTo header in messages. If
          * true, Camel does not send a reply back to the destination specified
          * in the JMSReplyTo header. You can use this option if you want Camel
@@ -308,6 +341,24 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
+         * Sets the JMS client ID to use. Note that this value, if specified,
+         * must be unique and can only be used by a single JMS connection
+         * instance. It is typically only required for durable topic
+         * subscriptions. If using Apache ActiveMQ you may prefer to use Virtual
+         * Topics instead.
+         * 
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
+         * 
+         * Group: consumer
+         * 
+         * @param clientId the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointConsumerBuilder clientId(String clientId) {
+            doSetProperty("clientId", clientId);
+            return this;
+        }
+        /**
          * Specifies the default number of concurrent consumers when consuming
          * from JMS (not for request/reply over JMS). See also the
          * maxMessagesPerTask option to control dynamic scaling up/down of
@@ -350,18 +401,19 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sets the durable subscription Id required for durable topics.
+         * The durable subscriber name for specifying durable topic
+         * subscriptions. The clientId option must be configured as well.
          * 
          * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: consumer
          * 
-         * @param durableSubscriptionId the value to set
+         * @param durableSubscriptionName the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointConsumerBuilder durableSubscriptionId(
-                String durableSubscriptionId) {
-            doSetProperty("durableSubscriptionId", durableSubscriptionId);
+        default SjmsEndpointConsumerBuilder durableSubscriptionName(
+                String durableSubscriptionName) {
+            doSetProperty("durableSubscriptionName", durableSubscriptionName);
             return this;
         }
         /**
@@ -398,77 +450,6 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Allows to configure the default errorHandler logging level for
-         * logging uncaught exceptions.
-         * 
-         * The option is a:
-         * &lt;code&gt;org.apache.camel.LoggingLevel&lt;/code&gt; type.
-         * 
-         * Default: WARN
-         * Group: logging
-         * 
-         * @param errorHandlerLoggingLevel the value to set
-         * @return the dsl builder
-         */
-        default SjmsEndpointConsumerBuilder errorHandlerLoggingLevel(
-                LoggingLevel errorHandlerLoggingLevel) {
-            doSetProperty("errorHandlerLoggingLevel", errorHandlerLoggingLevel);
-            return this;
-        }
-        /**
-         * Allows to configure the default errorHandler logging level for
-         * logging uncaught exceptions.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.LoggingLevel&lt;/code&gt; type.
-         * 
-         * Default: WARN
-         * Group: logging
-         * 
-         * @param errorHandlerLoggingLevel the value to set
-         * @return the dsl builder
-         */
-        default SjmsEndpointConsumerBuilder errorHandlerLoggingLevel(
-                String errorHandlerLoggingLevel) {
-            doSetProperty("errorHandlerLoggingLevel", errorHandlerLoggingLevel);
-            return this;
-        }
-        /**
-         * Allows to control whether stacktraces should be logged or not, by the
-         * default errorHandler.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: logging
-         * 
-         * @param errorHandlerLogStackTrace the value to set
-         * @return the dsl builder
-         */
-        default SjmsEndpointConsumerBuilder errorHandlerLogStackTrace(
-                boolean errorHandlerLogStackTrace) {
-            doSetProperty("errorHandlerLogStackTrace", errorHandlerLogStackTrace);
-            return this;
-        }
-        /**
-         * Allows to control whether stacktraces should be logged or not, by the
-         * default errorHandler.
-         * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
-         * 
-         * Default: true
-         * Group: logging
-         * 
-         * @param errorHandlerLogStackTrace the value to set
-         * @return the dsl builder
-         */
-        default SjmsEndpointConsumerBuilder errorHandlerLogStackTrace(
-                String errorHandlerLogStackTrace) {
-            doSetProperty("errorHandlerLogStackTrace", errorHandlerLogStackTrace);
-            return this;
-        }
-        /**
          * Specifies whether to use transacted mode.
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
@@ -783,73 +764,6 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
-         * The maximum number of connections available to this endpoint.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default AdvancedSjmsEndpointConsumerBuilder connectionCount(
-                Integer connectionCount) {
-            doSetProperty("connectionCount", connectionCount);
-            return this;
-        }
-        /**
-         * The maximum number of connections available to this endpoint.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default AdvancedSjmsEndpointConsumerBuilder connectionCount(
-                String connectionCount) {
-            doSetProperty("connectionCount", connectionCount);
-            return this;
-        }
-        /**
-         * Initializes the connectionFactory for the endpoint, which takes
-         * precedence over the component's connectionFactory, if any.
-         * 
-         * The option is a: &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt;
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionFactory the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjmsEndpointConsumerBuilder connectionFactory(
-                Object connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
-         * Initializes the connectionFactory for the endpoint, which takes
-         * precedence over the component's connectionFactory, if any.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionFactory the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjmsEndpointConsumerBuilder connectionFactory(
-                String connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
          * To use a custom DestinationCreationStrategy.
          * 
          * The option is a:
@@ -1241,45 +1155,6 @@ public interface SjmsEndpointBuilderFactory {
             doSetProperty("transferException", transferException);
             return this;
         }
-        /**
-         * Specifies whether to share JMS session with other SJMS endpoints.
-         * Turn this off if your route is accessing to multiple JMS providers.
-         * If you need transaction against multiple JMS providers, use jms
-         * component to leverage XA transaction.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: transaction (advanced)
-         * 
-         * @param sharedJMSSession the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjmsEndpointConsumerBuilder sharedJMSSession(
-                boolean sharedJMSSession) {
-            doSetProperty("sharedJMSSession", sharedJMSSession);
-            return this;
-        }
-        /**
-         * Specifies whether to share JMS session with other SJMS endpoints.
-         * Turn this off if your route is accessing to multiple JMS providers.
-         * If you need transaction against multiple JMS providers, use jms
-         * component to leverage XA transaction.
-         * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
-         * 
-         * Default: true
-         * Group: transaction (advanced)
-         * 
-         * @param sharedJMSSession the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjmsEndpointConsumerBuilder sharedJMSSession(
-                String sharedJMSSession) {
-            doSetProperty("sharedJMSSession", sharedJMSSession);
-            return this;
-        }
     }
 
     /**
@@ -1328,6 +1203,40 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
+         * The connection factory to be use. A connection factory must be
+         * configured either on the component or endpoint.
+         * 
+         * The option is a: &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt;
+         * type.
+         * 
+         * Group: common
+         * 
+         * @param connectionFactory the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointProducerBuilder connectionFactory(
+                Object connectionFactory) {
+            doSetProperty("connectionFactory", connectionFactory);
+            return this;
+        }
+        /**
+         * The connection factory to be use. A connection factory must be
+         * configured either on the component or endpoint.
+         * 
+         * The option will be converted to a
+         * &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt; type.
+         * 
+         * Group: common
+         * 
+         * @param connectionFactory the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointProducerBuilder connectionFactory(
+                String connectionFactory) {
+            doSetProperty("connectionFactory", connectionFactory);
+            return this;
+        }
+        /**
          * Specifies whether Camel ignores the JMSReplyTo header in messages. If
          * true, Camel does not send a reply back to the destination specified
          * in the JMSReplyTo header. You can use this option if you want Camel
@@ -1496,49 +1405,6 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
-         * 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.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: producer
-         * 
-         * @param explicitQosEnabled the value to set
-         * @return the dsl builder
-         */
-        default SjmsEndpointProducerBuilder explicitQosEnabled(
-                Boolean explicitQosEnabled) {
-            doSetProperty("explicitQosEnabled", explicitQosEnabled);
-            return this;
-        }
-        /**
-         * 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.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: producer
-         * 
-         * @param explicitQosEnabled the value to set
-         * @return the dsl builder
-         */
-        default SjmsEndpointProducerBuilder explicitQosEnabled(
-                String explicitQosEnabled) {
-            doSetProperty("explicitQosEnabled", explicitQosEnabled);
-            return this;
-        }
-        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -1588,55 +1454,6 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Set to true, if you want to send message using the QoS settings
-         * specified on the message, instead of the QoS settings on the JMS
-         * endpoint. The following three headers are considered JMSPriority,
-         * JMSDeliveryMode, and JMSExpiration. You can provide all or only some
-         * of them. If not provided, Camel will fall back to use the values from
-         * the endpoint instead. So, when using this option, the headers
-         * override the values from the endpoint. The explicitQosEnabled option,
-         * by contrast, will only use options set on the endpoint, and not
-         * values from the message header.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: producer
-         * 
-         * @param preserveMessageQos the value to set
-         * @return the dsl builder
-         */
-        default SjmsEndpointProducerBuilder preserveMessageQos(
-                boolean preserveMessageQos) {
-            doSetProperty("preserveMessageQos", preserveMessageQos);
-            return this;
-        }
-        /**
-         * Set to true, if you want to send message using the QoS settings
-         * specified on the message, instead of the QoS settings on the JMS
-         * endpoint. The following three headers are considered JMSPriority,
-         * JMSDeliveryMode, and JMSExpiration. You can provide all or only some
-         * of them. If not provided, Camel will fall back to use the values from
-         * the endpoint instead. So, when using this option, the headers
-         * override the values from the endpoint. The explicitQosEnabled option,
-         * by contrast, will only use options set on the endpoint, and not
-         * values from the message header.
-         * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
-         * 
-         * Default: false
-         * Group: producer
-         * 
-         * @param preserveMessageQos the value to set
-         * @return the dsl builder
-         */
-        default SjmsEndpointProducerBuilder preserveMessageQos(
-                String preserveMessageQos) {
-            doSetProperty("preserveMessageQos", preserveMessageQos);
-            return this;
-        }
-        /**
          * Values greater than 1 specify the message priority when sending
          * (where 1 is the lowest priority and 9 is the highest). The
          * explicitQosEnabled option must also be enabled in order for this
@@ -1729,13 +1546,9 @@ public interface SjmsEndpointBuilderFactory {
         /**
          * 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.
+         * are: Temporary or Exclusive. By default Camel will use temporary
+         * queues. However if replyTo has been configured, then Exclusive is
+         * used.
          * 
          * The option is a:
          * &lt;code&gt;org.apache.camel.component.sjms.ReplyToType&lt;/code&gt;
@@ -1753,13 +1566,9 @@ public interface SjmsEndpointBuilderFactory {
         /**
          * 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.
+         * are: Temporary or Exclusive. By default Camel will use temporary
+         * queues. However if replyTo has been configured, then Exclusive is
+         * used.
          * 
          * The option will be converted to a
          * &lt;code&gt;org.apache.camel.component.sjms.ReplyToType&lt;/code&gt;
@@ -1971,29 +1780,82 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Only applicable when sending to JMS destination using InOnly (eg fire
-         * and forget). Enabling this option will enrich the Camel Exchange with
-         * the actual JMSMessageID that was used by the JMS client when the
-         * message was sent to the JMS destination.
+         * 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.
+         * 
+         * The option is a: &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: producer (advanced)
+         * 
+         * @param explicitQosEnabled the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointProducerBuilder explicitQosEnabled(
+                Boolean explicitQosEnabled) {
+            doSetProperty("explicitQosEnabled", explicitQosEnabled);
+            return this;
+        }
+        /**
+         * 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.
+         * 
+         * The option will be converted to a
+         * &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: producer (advanced)
+         * 
+         * @param explicitQosEnabled the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointProducerBuilder explicitQosEnabled(
+                String explicitQosEnabled) {
+            doSetProperty("explicitQosEnabled", explicitQosEnabled);
+            return this;
+        }
+        /**
+         * Set to true, if you want to send message using the QoS settings
+         * specified on the message, instead of the QoS settings on the JMS
+         * endpoint. The following three headers are considered JMSPriority,
+         * JMSDeliveryMode, and JMSExpiration. You can provide all or only some
+         * of them. If not provided, Camel will fall back to use the values from
+         * the endpoint instead. So, when using this option, the headers
+         * override the values from the endpoint. The explicitQosEnabled option,
+         * by contrast, will only use options set on the endpoint, and not
+         * values from the message header.
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
          * Default: false
          * Group: producer (advanced)
          * 
-         * @param includeSentJMSMessageID the value to set
+         * @param preserveMessageQos the value to set
          * @return the dsl builder
          */
-        default AdvancedSjmsEndpointProducerBuilder includeSentJMSMessageID(
-                boolean includeSentJMSMessageID) {
-            doSetProperty("includeSentJMSMessageID", includeSentJMSMessageID);
+        default AdvancedSjmsEndpointProducerBuilder preserveMessageQos(
+                boolean preserveMessageQos) {
+            doSetProperty("preserveMessageQos", preserveMessageQos);
             return this;
         }
         /**
-         * Only applicable when sending to JMS destination using InOnly (eg fire
-         * and forget). Enabling this option will enrich the Camel Exchange with
-         * the actual JMSMessageID that was used by the JMS client when the
-         * message was sent to the JMS destination.
+         * Set to true, if you want to send message using the QoS settings
+         * specified on the message, instead of the QoS settings on the JMS
+         * endpoint. The following three headers are considered JMSPriority,
+         * JMSDeliveryMode, and JMSExpiration. You can provide all or only some
+         * of them. If not provided, Camel will fall back to use the values from
+         * the endpoint instead. So, when using this option, the headers
+         * override the values from the endpoint. The explicitQosEnabled option,
+         * by contrast, will only use options set on the endpoint, and not
+         * values from the message header.
          * 
          * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
          * type.
@@ -2001,12 +1863,12 @@ public interface SjmsEndpointBuilderFactory {
          * Default: false
          * Group: producer (advanced)
          * 
-         * @param includeSentJMSMessageID the value to set
+         * @param preserveMessageQos the value to set
          * @return the dsl builder
          */
-        default AdvancedSjmsEndpointProducerBuilder includeSentJMSMessageID(
-                String includeSentJMSMessageID) {
-            doSetProperty("includeSentJMSMessageID", includeSentJMSMessageID);
+        default AdvancedSjmsEndpointProducerBuilder preserveMessageQos(
+                String preserveMessageQos) {
+            doSetProperty("preserveMessageQos", preserveMessageQos);
             return this;
         }
         /**
@@ -2096,73 +1958,6 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
-         * The maximum number of connections available to this endpoint.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default AdvancedSjmsEndpointProducerBuilder connectionCount(
-                Integer connectionCount) {
-            doSetProperty("connectionCount", connectionCount);
-            return this;
-        }
-        /**
-         * The maximum number of connections available to this endpoint.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default AdvancedSjmsEndpointProducerBuilder connectionCount(
-                String connectionCount) {
-            doSetProperty("connectionCount", connectionCount);
-            return this;
-        }
-        /**
-         * Initializes the connectionFactory for the endpoint, which takes
-         * precedence over the component's connectionFactory, if any.
-         * 
-         * The option is a: &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt;
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionFactory the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjmsEndpointProducerBuilder connectionFactory(
-                Object connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
-         * Initializes the connectionFactory for the endpoint, which takes
-         * precedence over the component's connectionFactory, if any.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionFactory the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjmsEndpointProducerBuilder connectionFactory(
-                String connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
          * To use a custom DestinationCreationStrategy.
          * 
          * The option is a:
@@ -2554,45 +2349,6 @@ public interface SjmsEndpointBuilderFactory {
             doSetProperty("transferException", transferException);
             return this;
         }
-        /**
-         * Specifies whether to share JMS session with other SJMS endpoints.
-         * Turn this off if your route is accessing to multiple JMS providers.
-         * If you need transaction against multiple JMS providers, use jms
-         * component to leverage XA transaction.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: transaction (advanced)
-         * 
-         * @param sharedJMSSession the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjmsEndpointProducerBuilder sharedJMSSession(
-                boolean sharedJMSSession) {
-            doSetProperty("sharedJMSSession", sharedJMSSession);
-            return this;
-        }
-        /**
-         * Specifies whether to share JMS session with other SJMS endpoints.
-         * Turn this off if your route is accessing to multiple JMS providers.
-         * If you need transaction against multiple JMS providers, use jms
-         * component to leverage XA transaction.
-         * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
-         * 
-         * Default: true
-         * Group: transaction (advanced)
-         * 
-         * @param sharedJMSSession the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjmsEndpointProducerBuilder sharedJMSSession(
-                String sharedJMSSession) {
-            doSetProperty("sharedJMSSession", sharedJMSSession);
-            return this;
-        }
     }
 
     /**
@@ -2642,6 +2398,38 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
+         * The connection factory to be use. A connection factory must be
+         * configured either on the component or endpoint.
+         * 
+         * The option is a: &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt;
+         * type.
+         * 
+         * Group: common
+         * 
+         * @param connectionFactory the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointBuilder connectionFactory(Object connectionFactory) {
+            doSetProperty("connectionFactory", connectionFactory);
+            return this;
+        }
+        /**
+         * The connection factory to be use. A connection factory must be
+         * configured either on the component or endpoint.
+         * 
+         * The option will be converted to a
+         * &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt; type.
+         * 
+         * Group: common
+         * 
+         * @param connectionFactory the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointBuilder connectionFactory(String connectionFactory) {
+            doSetProperty("connectionFactory", connectionFactory);
+            return this;
+        }
+        /**
          * Specifies whether Camel ignores the JMSReplyTo header in messages. If
          * true, Camel does not send a reply back to the destination specified
          * in the JMSReplyTo header. You can use this option if you want Camel
@@ -2872,73 +2660,6 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
-         * The maximum number of connections available to this endpoint.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default AdvancedSjmsEndpointBuilder connectionCount(
-                Integer connectionCount) {
-            doSetProperty("connectionCount", connectionCount);
-            return this;
-        }
-        /**
-         * The maximum number of connections available to this endpoint.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default AdvancedSjmsEndpointBuilder connectionCount(
-                String connectionCount) {
-            doSetProperty("connectionCount", connectionCount);
-            return this;
-        }
-        /**
-         * Initializes the connectionFactory for the endpoint, which takes
-         * precedence over the component's connectionFactory, if any.
-         * 
-         * The option is a: &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt;
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionFactory the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjmsEndpointBuilder connectionFactory(
-                Object connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
-         * Initializes the connectionFactory for the endpoint, which takes
-         * precedence over the component's connectionFactory, if any.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionFactory the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjmsEndpointBuilder connectionFactory(
-                String connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
          * To use a custom DestinationCreationStrategy.
          * 
          * The option is a:
@@ -3326,45 +3047,6 @@ public interface SjmsEndpointBuilderFactory {
             doSetProperty("transferException", transferException);
             return this;
         }
-        /**
-         * Specifies whether to share JMS session with other SJMS endpoints.
-         * Turn this off if your route is accessing to multiple JMS providers.
-         * If you need transaction against multiple JMS providers, use jms
-         * component to leverage XA transaction.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: transaction (advanced)
-         * 
-         * @param sharedJMSSession the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjmsEndpointBuilder sharedJMSSession(
-                boolean sharedJMSSession) {
-            doSetProperty("sharedJMSSession", sharedJMSSession);
-            return this;
-        }
-        /**
-         * Specifies whether to share JMS session with other SJMS endpoints.
-         * Turn this off if your route is accessing to multiple JMS providers.
-         * If you need transaction against multiple JMS providers, use jms
-         * component to leverage XA transaction.
-         * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
-         * 
-         * Default: true
-         * Group: transaction (advanced)
-         * 
-         * @param sharedJMSSession the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjmsEndpointBuilder sharedJMSSession(
-                String sharedJMSSession) {
-            doSetProperty("sharedJMSSession", sharedJMSSession);
-            return this;
-        }
     }
 
     /**
diff --git a/docs/components/modules/ROOT/pages/sjms-component.adoc b/docs/components/modules/ROOT/pages/sjms-component.adoc
index 41ea4af..d1a2d59 100644
--- a/docs/components/modules/ROOT/pages/sjms-component.adoc
+++ b/docs/components/modules/ROOT/pages/sjms-component.adoc
@@ -81,15 +81,14 @@ You append query options to the URI using the following format,
 == Component Options and Configurations
 
 // component options: START
-The Simple JMS component supports 14 options, which are listed below.
+The Simple JMS component supports 11 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *connectionCount* (common) | The maximum number of connections available to endpoints started under this component | 1 | Integer
-| *connectionFactory* (common) | *Autowired* A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource. |  | ConnectionFactory
+| *connectionFactory* (common) | *Autowired* The connection factory to be use. A connection factory must be configured either on the component or endpoint. |  | ConnectionFactory
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
@@ -100,8 +99,6 @@ The Simple JMS component supports 14 options, which are listed below.
 | *replyToOnTimeoutMaxConcurrent{zwsp}Consumers* (advanced) | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS. | 1 | int
 | *requestTimeoutCheckerInterval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
-| *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
-| *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 |===
 // component options: END
 
@@ -126,21 +123,23 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (48 parameters):
+=== Query Parameters (44 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *acknowledgementMode* (common) | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. There are 4 enums and the value can be one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | SessionAcknowledgementType
+| *connectionFactory* (common) | The connection factory to be use. A connection factory must be configured either on the component or endpoint. |  | ConnectionFactory
 | *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message broker [...]
 | *replyTo* (common) | Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer). |  | String
 | *testConnectionOnStartup* (common) | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | boolean
 | *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100% strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transac [...]
 | *autoStartup* (consumer) | Specifies whether the consumer container should auto-startup. | true | boolean
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
+| *clientId* (consumer) | Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics instead. |  | String
 | *concurrentConsumers* (consumer) | Specifies the default number of concurrent consumers when consuming from JMS (not for request/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. When doing request/reply over JMS then the option replyToConcurrentConsumers is used to control number of concurrent consumers on the reply message listener. | 1 | int
-| *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
+| *durableSubscriptionName* (consumer) | The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configured as well. |  | String
 | *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
 | *eagerLoadingOfProperties* (consumer) | Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes can catch early any issues with the underlying JMS provider and the use of JMS properties. See also the option eagerPoisonBody. | false | boolean
 | *eagerPoisonBody* (consumer) | If eagerLoadingOfProperties is enabled and the JMS message payload (JMS body or JMS properties) is poison (cannot be read/mapped), then set this text as the message body instead so the message can be processed (the cause of the poison are already stored as exception on the Exchange). This can be turned off by setting eagerPoisonBody=false. See also the option eagerLoadingOfProperties. | Poison JMS message due to ${exception.message} | String
@@ -150,22 +149,19 @@ with the following path and query parameters:
 | *replyToSameDestinationAllowed* (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
 | *deliveryMode* (producer) | Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2. There are 2 enums and the value can be one of: 1, 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
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
 | *replyToConcurrentConsumers* (producer) | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. | 1 | int
 | *replyToOverride* (producer) | Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination. |  | String
-| *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  [...]
+| *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 or Exclusive. By default Camel will use temporary queues. However if replyTo has been configured, then Exclusive is used. There are 2 enums and the value can be one of: Temporary, 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
 | *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
 | *disableTimeToLive* (producer) | Use this option to force disabling time to live. For example when you do request/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message being sent. The problem is that the sender and receiver systems have to have their clocks synchronized, so they are in sync. This is not always so easy to archive. So you can use disableTimeToLive=true to not set a time to live value on the sent message. Then the message w [...]
-| *includeSentJMSMessageID* (producer) | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination. | false | 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
+| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
-| *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
-| *connectionFactory* (advanced) | Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any |  | ConnectionFactory
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *exceptionListener* (advanced) | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. |  | ExceptionListener
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
@@ -176,10 +172,7 @@ with the following path and query parameters:
 | *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
-| *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
-| *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
-| *sharedJMSSession* (transaction) | Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS providers, use jms component to leverage XA transaction. | true | boolean
 |===
 // endpoint options: END
 
diff --git a/docs/components/modules/ROOT/pages/sjms2-component.adoc b/docs/components/modules/ROOT/pages/sjms2-component.adoc
index db22c0a..9bdbeae 100644
--- a/docs/components/modules/ROOT/pages/sjms2-component.adoc
+++ b/docs/components/modules/ROOT/pages/sjms2-component.adoc
@@ -81,15 +81,14 @@ You append query options to the URI using the following format,
 == Component Options and Configurations
 
 // component options: START
-The Simple JMS2 component supports 14 options, which are listed below.
+The Simple JMS2 component supports 11 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *connectionCount* (common) | The maximum number of connections available to endpoints started under this component | 1 | Integer
-| *connectionFactory* (common) | *Autowired* A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource. |  | ConnectionFactory
+| *connectionFactory* (common) | *Autowired* The connection factory to be use. A connection factory must be configured either on the component or endpoint. |  | ConnectionFactory
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
@@ -100,8 +99,6 @@ The Simple JMS2 component supports 14 options, which are listed below.
 | *replyToOnTimeoutMaxConcurrent{zwsp}Consumers* (advanced) | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS. | 1 | int
 | *requestTimeoutCheckerInterval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
-| *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
-| *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 |===
 // component options: END
 
@@ -126,22 +123,24 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (51 parameters):
+=== Query Parameters (47 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *acknowledgementMode* (common) | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. There are 4 enums and the value can be one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | SessionAcknowledgementType
+| *connectionFactory* (common) | The connection factory to be use. A connection factory must be configured either on the component or endpoint. |  | ConnectionFactory
 | *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message broker [...]
 | *replyTo* (common) | Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer). |  | String
 | *testConnectionOnStartup* (common) | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | boolean
 | *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100% strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transac [...]
 | *autoStartup* (consumer) | Specifies whether the consumer container should auto-startup. | true | boolean
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
+| *clientId* (consumer) | Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics instead. |  | String
 | *concurrentConsumers* (consumer) | Specifies the default number of concurrent consumers when consuming from JMS (not for request/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. When doing request/reply over JMS then the option replyToConcurrentConsumers is used to control number of concurrent consumers on the reply message listener. | 1 | int
 | *durable* (consumer) | Sets topic consumer to durable. | false | boolean
-| *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
+| *durableSubscriptionName* (consumer) | The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configured as well. |  | String
 | *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
 | *shared* (consumer) | Sets the consumer to shared. | false | boolean
 | *subscriptionId* (consumer) | Sets the subscription Id, required for durable or shared topics. |  | String
@@ -153,22 +152,19 @@ with the following path and query parameters:
 | *replyToSameDestinationAllowed* (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
 | *deliveryMode* (producer) | Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2. There are 2 enums and the value can be one of: 1, 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
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
 | *replyToConcurrentConsumers* (producer) | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. | 1 | int
 | *replyToOverride* (producer) | Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination. |  | String
-| *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  [...]
+| *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 or Exclusive. By default Camel will use temporary queues. However if replyTo has been configured, then Exclusive is used. There are 2 enums and the value can be one of: Temporary, 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
 | *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
 | *disableTimeToLive* (producer) | Use this option to force disabling time to live. For example when you do request/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message being sent. The problem is that the sender and receiver systems have to have their clocks synchronized, so they are in sync. This is not always so easy to archive. So you can use disableTimeToLive=true to not set a time to live value on the sent message. Then the message w [...]
-| *includeSentJMSMessageID* (producer) | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination. | false | 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
+| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
-| *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
-| *connectionFactory* (advanced) | Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any |  | ConnectionFactory
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *exceptionListener* (advanced) | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. |  | ExceptionListener
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
@@ -179,10 +175,7 @@ with the following path and query parameters:
 | *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
-| *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
-| *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
-| *sharedJMSSession* (transaction) | Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS providers, use jms component to leverage XA transaction. | true | boolean
 |===
 // endpoint options: END
 


[camel] 01/07: CAMEL-15990: camel-sjms - Support regular connection pool. CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms (producer)

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 73cd7d678433273161bc22ef3ef7ab84434182dd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jan 4 10:11:44 2021 +0100

    CAMEL-15990: camel-sjms - Support regular connection pool.
    CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms (producer)
---
 .../org/apache/camel/catalog/components.properties |   1 -
 .../org/apache/camel/catalog/components/jms.json   |   4 +-
 .../camel/catalog/components/sjms-batch.json       |  58 --
 .../org/apache/camel/catalog/components/sjms.json  |  22 +-
 .../org/apache/camel/catalog/components/sjms2.json |  22 +-
 .../org/apache/camel/catalog/docs.properties       |   1 -
 .../apache/camel/catalog/docs/jms-component.adoc   |   4 +-
 .../camel/catalog/docs/sjms-batch-component.adoc   | 207 -------
 .../apache/camel/catalog/docs/sjms-component.adoc  |  89 +--
 .../apache/camel/catalog/docs/sjms2-component.adoc |  44 +-
 .../org/apache/camel/component/jms/jms.json        |   4 +-
 .../camel-jms/src/main/docs/jms-component.adoc     |   4 +-
 .../camel/component/jms/JmsConfiguration.java      |   2 +-
 .../component/sjms/SjmsComponentConfigurer.java    |   6 -
 .../component/sjms/SjmsEndpointConfigurer.java     | 105 ++--
 .../component/sjms/SjmsEndpointUriFactory.java     |  21 +-
 .../sjms/batch/SjmsBatchComponentConfigurer.java   |  79 ---
 .../sjms/batch/SjmsBatchEndpointConfigurer.java    | 178 ------
 .../sjms/batch/SjmsBatchEndpointUriFactory.java    |  84 ---
 .../services/org/apache/camel/component.properties |   2 +-
 .../services/org/apache/camel/component/sjms-batch |   2 -
 .../apache/camel/configurer/sjms-batch-component   |   2 -
 .../apache/camel/configurer/sjms-batch-endpoint    |   2 -
 .../apache/camel/urifactory/sjms-batch-endpoint    |   2 -
 .../camel/component/sjms/batch/sjms-batch.json     |  58 --
 .../org/apache/camel/component/sjms/sjms.json      |  22 +-
 .../src/main/docs/sjms-batch-component.adoc        | 207 -------
 .../camel-sjms/src/main/docs/sjms-component.adoc   |  89 +--
 .../component/sjms/MessageConsumerResources.java   |   1 +
 .../camel/component/sjms/MessageProducerPool.java  |  75 ---
 .../component/sjms/MessageProducerResources.java   |  69 ---
 .../camel/component/sjms/SessionCallback.java}     |  26 +-
 .../apache/camel/component/sjms/SjmsComponent.java |  43 +-
 .../apache/camel/component/sjms/SjmsConstants.java |   2 +
 .../apache/camel/component/sjms/SjmsConsumer.java  |  33 +-
 .../apache/camel/component/sjms/SjmsEndpoint.java  | 319 +++++------
 .../apache/camel/component/sjms/SjmsProducer.java  | 379 ++-----------
 .../apache/camel/component/sjms/SjmsTemplate.java  | 117 ++++
 .../component/sjms/batch/SessionCompletion.java    |  57 --
 .../component/sjms/batch/SjmsBatchComponent.java   |  97 ----
 .../component/sjms/batch/SjmsBatchConsumer.java    | 604 --------------------
 .../component/sjms/batch/SjmsBatchEndpoint.java    | 427 --------------
 .../sjms/jms/ConnectionFactoryResource.java        |   1 +
 .../component/sjms/jms/ConnectionResource.java     |   1 +
 .../component/sjms/jms/DestinationNameParser.java  |  10 +-
 .../component/sjms/jms/IllegalHeaderException.java |  55 --
 .../component/sjms/jms/Jms11ObjectFactory.java     |  15 +-
 .../camel/component/sjms/jms/JmsObjectFactory.java |   2 +
 .../component/sjms/producer/InOnlyProducer.java    | 119 ++--
 .../component/sjms/producer/InOutProducer.java     | 197 +++----
 .../sjms/taskmanager/TimedTaskManager.java         |  52 --
 .../sjms/tx/BatchTransactionCommitStrategy.java    |  59 --
 .../tx/SessionBatchTransactionSynchronization.java | 155 ------
 .../sjms/tx/SessionTransactionSynchronization.java |  39 +-
 .../component/sjms/ReconnectInOutProducerTest.java |   2 +-
 .../component/sjms/SjmsComponentRestartTest.java   |  20 +-
 .../sjms/SjmsDestinationCreationStrategyTest.java  |   6 +-
 .../camel/component/sjms/SjmsEndpointTest.java     |  59 +-
 .../sjms/batch/EmbeddedActiveMQBroker.java         |  76 ---
 .../batch/SjmsBatchConsumerAsyncStartTest.java     |  51 --
 .../sjms/batch/SjmsBatchConsumerTest.java          | 508 -----------------
 .../sjms/batch/SjmsBatchEndpointTest.java          | 117 ----
 .../sjms/consumer/AsyncConsumerInOutTest.java      |   2 +-
 .../consumer/InOnlyTopicDurableConsumerTest.java   |  32 +-
 .../sjms/consumer/InOutConcurrentConsumerTest.java |   4 +-
 .../sjms/consumer/InOutConsumerQueueAsyncTest.java |   2 +-
 .../sjms/consumer/InOutConsumerQueueTest.java      |   2 +-
 .../sjms/consumer/InOutConsumerTopicTest.java      |   2 +-
 .../consumer/InOutSynchronousConsumerTest.java     |   2 +-
 .../camel/component/sjms/it/AsyncJmsInOutIT.java   |   4 +-
 .../component/sjms/it/ConnectionResourceIT.java    |   2 +-
 .../camel/component/sjms/it/SyncJmsInOutIT.java    |   4 +-
 .../sjms/manual/ManualBatchFromQueueTest.java      |  79 ---
 .../producer/InOutQueueProducerAsyncLoadTest.java  |  11 +-
 .../producer/InOutQueueProducerSyncLoadTest.java   |  13 +-
 .../sjms/producer/InOutQueueProducerTest.java      |   2 +-
 .../component/sjms/producer/PrefillPoolTest.java   |  57 --
 .../sjms/producer/QueueProducerQoSTest.java        |   5 +-
 .../component/sjms/support/JmsTestSupport.java     |   7 +-
 ...chTransactedConcurrentMultipleConsumerTest.java |  52 --
 ...sactedConcurrentMultipleRouteConsumersTest.java |  53 --
 .../sjms/tx/BatchTransactedQueueConsumerTest.java  |  53 --
 ...chTransactedTopicConsumerMultipleRouteTest.java |  53 --
 .../sjms/tx/BatchTransactedTopicConsumerTest.java  |  53 --
 .../sjms/tx/TransactedConcurrentConsumersTest.java |   5 +-
 .../sjms/tx/TransactedConsumerSupport.java         |   8 +-
 .../tx/TransactedConsumersMultipleRouteTest.java   |   5 +-
 .../sjms/tx/TransactedProducerInOutErrorTest.java  |   2 +-
 .../sjms/tx/TransactedQueueConsumerTest.java       |   5 +-
 .../sjms/tx/TransactedQueueProducerTest.java       |  18 -
 .../sjms/tx/TransactedTopicConsumerTest.java       |   4 +-
 .../sjms/tx/TransactedTopicProducerTest.java       |  39 +-
 .../component/sjms2/Sjms2EndpointUriFactory.java   |  21 +-
 .../org/apache/camel/component/sjms2/sjms2.json    |  22 +-
 .../camel-sjms2/src/main/docs/sjms2-component.adoc |  44 +-
 .../component/sjms2/jms/Jms2ObjectFactory.java     |  16 +-
 .../component/sjms2/Sjms2ComponentRestartTest.java |  14 +-
 .../camel/component/sjms2/Sjms2EndpointTest.java   |  66 +--
 .../sjms2/producer/InOnlyQueueProducerTest.java    |  11 -
 .../component/sjms2/support/Jms2TestSupport.java   |  12 +-
 .../component/ComponentsBuilderFactory.java        |  14 -
 .../component/dsl/JmsComponentBuilderFactory.java  |   2 +-
 .../dsl/Sjms2ComponentBuilderFactory.java          |  17 -
 .../dsl/SjmsBatchComponentBuilderFactory.java      | 201 -------
 .../component/dsl/SjmsComponentBuilderFactory.java |  17 -
 .../src/generated/resources/metadata.json          |  22 -
 .../endpoint/dsl/JmsEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  | 620 +++++++++++++++------
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   | 617 ++++++++++++++------
 docs/components/modules/ROOT/nav.adoc              |   1 -
 .../modules/ROOT/pages/jms-component.adoc          |   4 +-
 .../modules/ROOT/pages/sjms-batch-component.adoc   | 209 -------
 .../modules/ROOT/pages/sjms-component.adoc         |  89 +--
 .../modules/ROOT/pages/sjms2-component.adoc        |  44 +-
 114 files changed, 1790 insertions(+), 5971 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
index 513f253..02934c2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
@@ -294,7 +294,6 @@ sftp
 sip
 sips
 sjms
-sjms-batch
 sjms2
 slack
 smpp
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jms.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jms.json
index 810c6ed..4091f48 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jms.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jms.json
@@ -58,7 +58,7 @@
     "formatDateHeadersToIso8601": { "kind": "property", "displayName": "Format Date Headers To Iso8601", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether JMS date properties should be formatted according to the ISO 8 [...]
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
     "preserveMessageQos": { "kind": "property", "displayName": "Preserve Message Qos", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set to true, if you want to send message using the QoS settings specified on the message, ins [...]
-    "priority": { "kind": "property", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Values greater than 1 specify the message priority when sending (w [...]
+    "priority": { "kind": "property", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Values greater than 1 specify the message priority when sending (w [...]
     "replyToConcurrentConsumers": { "kind": "property", "displayName": "Reply To Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the default number of concurrent consumers when doing request\/reply over  [...]
     "replyToMaxConcurrentConsumers": { "kind": "property", "displayName": "Reply To Max Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the maximum number of concurrent consumers when using request\/reply over JMS. See als [...]
     "replyToOnTimeoutMaxConcurrentConsumers": { "kind": "property", "displayName": "Reply To On Timeout Max Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the maximum number of concurrent consumers for  [...]
@@ -160,7 +160,7 @@
     "formatDateHeadersToIso8601": { "kind": "parameter", "displayName": "Format Date Headers To Iso8601", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether JMS date properties should be formatted according to the ISO  [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
     "preserveMessageQos": { "kind": "parameter", "displayName": "Preserve Message Qos", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set to true, if you want to send message using the QoS settings specified on the message, in [...]
-    "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Values greater than 1 specify the message priority when sending ( [...]
+    "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Values greater than 1 specify the message priority when sending ( [...]
     "replyToConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the default number of concurrent consumers when doing request\/reply over [...]
     "replyToMaxConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To Max Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the maximum number of concurrent consumers when using request\/reply over JMS. See al [...]
     "replyToOnTimeoutMaxConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To On Timeout Max Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the maximum number of concurrent consumers for [...]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms-batch.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms-batch.json
deleted file mode 100644
index 3930a7e..0000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms-batch.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "sjms-batch",
-    "title": "Simple JMS Batch",
-    "description": "Highly performant and transactional batch consumption of messages from a JMS queue.",
-    "deprecated": false,
-    "firstVersion": "2.16.0",
-    "label": "messaging",
-    "javaType": "org.apache.camel.component.sjms.batch.SjmsBatchComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-sjms",
-    "version": "3.8.0-SNAPSHOT",
-    "scheme": "sjms-batch",
-    "extendsScheme": "",
-    "syntax": "sjms-batch:destinationName",
-    "async": false,
-    "api": false,
-    "consumerOnly": true,
-    "producerOnly": false,
-    "lenientProperties": false
-  },
-  "componentProperties": {
-    "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
-    "asyncStartListener": { "kind": "property", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/or [...]
-    "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
-    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "A ConnectionFactory is required to enable the SjmsBatchComponent." },
-    "recoveryInterval": { "kind": "property", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 5000, "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
-    "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." }
-  },
-  "properties": {
-    "destinationName": { "kind": "path", "displayName": "Destination Name", "group": "consumer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The destination name. Only queues are supported, names may be prefixed by 'queue:'." },
-    "aggregationStrategy": { "kind": "parameter", "displayName": "Aggregation Strategy", "group": "consumer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.AggregationStrategy", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The aggregation strategy to use, which merges all the batched messages into a single message" },
-    "allowNullBody": { "kind": "parameter", "displayName": "Allow Null Body", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an JMSException is thrown." },
-    "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
-    "completionInterval": { "kind": "parameter", "displayName": "Completion Interval", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1000, "description": "The completion interval in millis, which causes batches to be completed in a scheduled fixed rate every interval. The batch may be empty if the timeout triggered and there was no messages in the batch. Notice you canno [...]
-    "completionPredicate": { "kind": "parameter", "displayName": "Completion Predicate", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The completion predicate, which causes batches to be completed when the predicate evaluates as true. The predicate can also be configured using the simple language using the string syntax. You may want to set the option eagerC [...]
-    "completionSize": { "kind": "parameter", "displayName": "Completion Size", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 200, "description": "The number of messages consumed at which the batch will be completed" },
-    "completionTimeout": { "kind": "parameter", "displayName": "Completion Timeout", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 500, "description": "The timeout in millis from receipt of the first first message when the batch will be completed. The batch may be empty if the timeout triggered and there was no messages in the batch. Notice you cannot use both completion [...]
-    "consumerCount": { "kind": "parameter", "displayName": "Consumer Count", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "The number of JMS sessions to consume from" },
-    "eagerCheckCompletion": { "kind": "parameter", "displayName": "Eager Check Completion", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Use eager completion checking which means that the completionPredicate will use the incoming Exchange. As opposed to without eager completion checking the completionPredicate will use the aggregated Exchange." },
-    "includeAllJMSXProperties": { "kind": "parameter", "displayName": "Include All JMSXProperties", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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 he [...]
-    "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc. See section about how mapping works below for more details." },
-    "pollDuration": { "kind": "parameter", "displayName": "Poll Duration", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1000, "description": "The duration in milliseconds of each poll for messages. completionTimeOut will be used if it is shorter and a batch has started." },
-    "sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If using completion timeout or interval, then the batch may be empty if the timeout triggered and there was no messages in the batch. If this option is true and the batch is empty then an empty mess [...]
-    "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
-    "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
-    "asyncStartListener": { "kind": "parameter", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/o [...]
-    "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
-    "jmsKeyFormatStrategy": { "kind": "parameter", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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 pass [...]
-    "keepAliveDelay": { "kind": "parameter", "displayName": "Keep Alive Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 5000, "description": "The delay in millis between attempts to re-establish a valid session. If this is a positive value the SjmsBatchConsumer will attempt to create a new session if it sees an Exception during message consumption. This del [...]
-    "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
-    "recoveryInterval": { "kind": "parameter", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 5000, "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
-    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
-    "timeoutCheckerExecutorService": { "kind": "parameter", "displayName": "Timeout Checker Executor Service", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.concurrent.ScheduledExecutorService", "deprecated": false, "autowired": false, "secret": false, "description": "If using the completionInterval option a background thread is created to trigger the completion interval. Set this option to provide a custom thread pool to be used ra [...]
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms.json
index f504c36..47a2980 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms.json
@@ -36,7 +36,6 @@
     "destinationCreationStrategy": { "kind": "property", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
     "jmsKeyFormatStrategy": { "kind": "property", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The defau [...]
     "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
-    "timedTaskManager": { "kind": "property", "displayName": "Timed Task Manager", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.taskmanager.TimedTaskManager", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom TimedTaskManager" },
     "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "connectionPassword": { "kind": "property", "displayName": "Connection Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
     "connectionUsername": { "kind": "property", "displayName": "Connection Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
@@ -46,26 +45,31 @@
     "destinationType": { "kind": "path", "displayName": "Destination Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "queue", "topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "queue", "description": "The kind of destination to use" },
     "destinationName": { "kind": "path", "displayName": "Destination Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "DestinationName is a JMS queue or topic name. By default, the destinationName is interpreted as a queue name." },
     "acknowledgementMode": { "kind": "parameter", "displayName": "Acknowledgement Mode", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.SessionAcknowledgementType", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "description": "The JMS acknowledgement name, which is one of:  [...]
+    "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from  [...]
+    "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
     "consumerCount": { "kind": "parameter", "displayName": "Consumer Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Sets the number of consumer listeners used for this endpoint." },
     "durableSubscriptionId": { "kind": "parameter", "displayName": "Durable Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the durable subscription Id required for durable topics." },
     "reconnectBackOff": { "kind": "parameter", "displayName": "Reconnect Back Off", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Backoff in millis on consumer pool reconnection attempts" },
     "reconnectOnError": { "kind": "parameter", "displayName": "Reconnect On Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Try to apply reconnection logic on consumer pool" },
+    "replyToDeliveryPersistent": { "kind": "parameter", "displayName": "Reply To Delivery Persistent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to use persistent delivery by default for replies." },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported)." },
     "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
     "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
     "messageSelector": { "kind": "parameter", "displayName": "Message Selector", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the JMS Message selector syntax." },
+    "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2." },
+    "deliveryPersistent": { "kind": "parameter", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether persistent delivery is used by default." },
+    "explicitQosEnabled": { "kind": "parameter", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "description": "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 timeToLi [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
-    "namedReplyTo": { "kind": "parameter", "displayName": "Named Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the reply to destination name used for InOut producer endpoints. The type of the reply to destination can be determined by the starting prefix (topic: or queue:) in its name." },
-    "persistent": { "kind": "parameter", "displayName": "Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Flag used to enable\/disable message persistence." },
-    "producerCount": { "kind": "parameter", "displayName": "Producer Count", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Sets the number of producers used for this endpoint." },
-    "ttl": { "kind": "parameter", "displayName": "Ttl", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "-1", "description": "Flag used to adjust the Time To Live value of produced messages." },
+    "preserveMessageQos": { "kind": "parameter", "displayName": "Preserve Message Qos", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDelive [...]
+    "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "description": "Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in orde [...]
+    "replyToOverride": { "kind": "parameter", "displayName": "Reply To Override", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination." },
+    "requestTimeout": { "kind": "parameter", "displayName": "Request Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "20000", "description": "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 timeou [...]
+    "timeToLive": { "kind": "parameter", "displayName": "Time To Live", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "description": "When sending messages, specifies the time-to-live of the message (in milliseconds)." },
     "allowNullBody": { "kind": "parameter", "displayName": "Allow Null Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an JMSException is thrown." },
-    "prefillPool": { "kind": "parameter", "displayName": "Prefill Pool", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to prefill the producer connection pool on startup, or create connections lazy when needed." },
-    "responseTimeOut": { "kind": "parameter", "displayName": "Response Time Out", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5s", "description": "Sets the amount of time we should wait before timing out a InOut response." },
     "asyncStartListener": { "kind": "parameter", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/o [...]
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to stop the consumer message listener asynchronously, when stopping a route." },
-    "connectionCount": { "kind": "parameter", "displayName": "Connection Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "The maximum number of connections available to this endpoint" },
+    "connectionCount": { "kind": "parameter", "displayName": "Connection Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "description": "The maximum number of connections available to this endpoint" },
     "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any" },
     "connectionResource": { "kind": "parameter", "displayName": "Connection Resource", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.ConnectionResource", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any" },
     "destinationCreationStrategy": { "kind": "parameter", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
@@ -78,8 +82,6 @@
     "errorHandlerLoggingLevel": { "kind": "parameter", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "description": "Allows to configure the default errorHandler logging level for logging uncaught exceptions." },
     "errorHandlerLogStackTrace": { "kind": "parameter", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Allows to control whether stacktraces should be logged or not, by the default errorHandler." },
     "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to use transacted mode" },
-    "transactionBatchCount": { "kind": "parameter", "displayName": "Transaction Batch Count", "group": "transaction", "label": "consumer,transaction", "required": false, "type": "integer", "javaType": "int", "deprecated": true, "autowired": false, "secret": false, "defaultValue": -1, "description": "If transacted sets the number of messages to process before committing a transaction." },
-    "transactionBatchTimeout": { "kind": "parameter", "displayName": "Transaction Batch Timeout", "group": "transaction", "label": "consumer,transaction", "required": false, "type": "duration", "javaType": "long", "deprecated": true, "autowired": false, "secret": false, "defaultValue": "5s", "description": "Sets timeout (in millis) for batch transactions, the value should be 1000 or higher." },
     "transactionCommitStrategy": { "kind": "parameter", "displayName": "Transaction Commit Strategy", "group": "transaction", "label": "transaction", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.TransactionCommitStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the commit strategy." },
     "sharedJMSSession": { "kind": "parameter", "displayName": "Shared JMSSession", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS provi [...]
   }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms2.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms2.json
index 09930ab..8117c35 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms2.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms2.json
@@ -36,7 +36,6 @@
     "destinationCreationStrategy": { "kind": "property", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
     "jmsKeyFormatStrategy": { "kind": "property", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The defau [...]
     "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
-    "timedTaskManager": { "kind": "property", "displayName": "Timed Task Manager", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.taskmanager.TimedTaskManager", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom TimedTaskManager" },
     "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "connectionPassword": { "kind": "property", "displayName": "Connection Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
     "connectionUsername": { "kind": "property", "displayName": "Connection Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
@@ -46,29 +45,34 @@
     "destinationType": { "kind": "path", "displayName": "Destination Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "queue", "topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "queue", "description": "The kind of destination to use" },
     "destinationName": { "kind": "path", "displayName": "Destination Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "DestinationName is a JMS queue or topic name. By default, the destinationName is interpreted as a queue name." },
     "acknowledgementMode": { "kind": "parameter", "displayName": "Acknowledgement Mode", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.SessionAcknowledgementType", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "description": "The JMS acknowledgement name, which is one of:  [...]
+    "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from  [...]
+    "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
     "consumerCount": { "kind": "parameter", "displayName": "Consumer Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Sets the number of consumer listeners used for this endpoint." },
     "durable": { "kind": "parameter", "displayName": "Durable", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets topic consumer to durable." },
     "durableSubscriptionId": { "kind": "parameter", "displayName": "Durable Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the durable subscription Id required for durable topics." },
     "reconnectBackOff": { "kind": "parameter", "displayName": "Reconnect Back Off", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Backoff in millis on consumer pool reconnection attempts" },
     "reconnectOnError": { "kind": "parameter", "displayName": "Reconnect On Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Try to apply reconnection logic on consumer pool" },
+    "replyToDeliveryPersistent": { "kind": "parameter", "displayName": "Reply To Delivery Persistent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to use persistent delivery by default for replies." },
     "shared": { "kind": "parameter", "displayName": "Shared", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets the consumer to shared." },
     "subscriptionId": { "kind": "parameter", "displayName": "Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the subscription Id, required for durable or shared topics." },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported)." },
     "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
     "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
     "messageSelector": { "kind": "parameter", "displayName": "Message Selector", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the JMS Message selector syntax." },
+    "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2." },
+    "deliveryPersistent": { "kind": "parameter", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether persistent delivery is used by default." },
+    "explicitQosEnabled": { "kind": "parameter", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "description": "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 timeToLi [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
-    "namedReplyTo": { "kind": "parameter", "displayName": "Named Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the reply to destination name used for InOut producer endpoints. The type of the reply to destination can be determined by the starting prefix (topic: or queue:) in its name." },
-    "persistent": { "kind": "parameter", "displayName": "Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Flag used to enable\/disable message persistence." },
-    "producerCount": { "kind": "parameter", "displayName": "Producer Count", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Sets the number of producers used for this endpoint." },
-    "ttl": { "kind": "parameter", "displayName": "Ttl", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "-1", "description": "Flag used to adjust the Time To Live value of produced messages." },
+    "preserveMessageQos": { "kind": "parameter", "displayName": "Preserve Message Qos", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDelive [...]
+    "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "description": "Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in orde [...]
+    "replyToOverride": { "kind": "parameter", "displayName": "Reply To Override", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination." },
+    "requestTimeout": { "kind": "parameter", "displayName": "Request Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "20000", "description": "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 timeou [...]
+    "timeToLive": { "kind": "parameter", "displayName": "Time To Live", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "description": "When sending messages, specifies the time-to-live of the message (in milliseconds)." },
     "allowNullBody": { "kind": "parameter", "displayName": "Allow Null Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an JMSException is thrown." },
-    "prefillPool": { "kind": "parameter", "displayName": "Prefill Pool", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to prefill the producer connection pool on startup, or create connections lazy when needed." },
-    "responseTimeOut": { "kind": "parameter", "displayName": "Response Time Out", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5s", "description": "Sets the amount of time we should wait before timing out a InOut response." },
     "asyncStartListener": { "kind": "parameter", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/o [...]
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to stop the consumer message listener asynchronously, when stopping a route." },
-    "connectionCount": { "kind": "parameter", "displayName": "Connection Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "The maximum number of connections available to this endpoint" },
+    "connectionCount": { "kind": "parameter", "displayName": "Connection Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "description": "The maximum number of connections available to this endpoint" },
     "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any" },
     "connectionResource": { "kind": "parameter", "displayName": "Connection Resource", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.ConnectionResource", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any" },
     "destinationCreationStrategy": { "kind": "parameter", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
@@ -81,8 +85,6 @@
     "errorHandlerLoggingLevel": { "kind": "parameter", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "description": "Allows to configure the default errorHandler logging level for logging uncaught exceptions." },
     "errorHandlerLogStackTrace": { "kind": "parameter", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Allows to control whether stacktraces should be logged or not, by the default errorHandler." },
     "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to use transacted mode" },
-    "transactionBatchCount": { "kind": "parameter", "displayName": "Transaction Batch Count", "group": "transaction", "label": "consumer,transaction", "required": false, "type": "integer", "javaType": "int", "deprecated": true, "autowired": false, "secret": false, "defaultValue": -1, "description": "If transacted sets the number of messages to process before committing a transaction." },
-    "transactionBatchTimeout": { "kind": "parameter", "displayName": "Transaction Batch Timeout", "group": "transaction", "label": "consumer,transaction", "required": false, "type": "duration", "javaType": "long", "deprecated": true, "autowired": false, "secret": false, "defaultValue": "5s", "description": "Sets timeout (in millis) for batch transactions, the value should be 1000 or higher." },
     "transactionCommitStrategy": { "kind": "parameter", "displayName": "Transaction Commit Strategy", "group": "transaction", "label": "transaction", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.TransactionCommitStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the commit strategy." },
     "sharedJMSSession": { "kind": "parameter", "displayName": "Shared JMSSession", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS provi [...]
   }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties
index 05de5ca..8a8962e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties
@@ -456,7 +456,6 @@ sftp-component
 shiro
 simple-language
 sip-component
-sjms-batch-component
 sjms-component
 sjms2-component
 slack-component
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jms-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jms-component.adoc
index 0a6a19e..b3fd3f7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jms-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jms-component.adoc
@@ -229,7 +229,7 @@ The JMS component supports 96 options, which are listed below.
 | *formatDateHeadersToIso8601* (producer) | Sets whether JMS date properties should be formatted according to the ISO 8601 standard. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
-| *priority* (producer) | Values greater than 1 specify the message priority when sending (where 0 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
+| *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
 | *replyToConcurrentConsumers* (producer) | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. | 1 | int
 | *replyToMaxConcurrentConsumers* (producer) | Specifies the maximum number of concurrent consumers when using request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. |  | int
 | *replyToOnTimeoutMaxConcurrent{zwsp}Consumers* (producer) | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS. | 1 | int
@@ -373,7 +373,7 @@ with the following path and query parameters:
 | *formatDateHeadersToIso8601* (producer) | Sets whether JMS date properties should be formatted according to the ISO 8601 standard. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
-| *priority* (producer) | Values greater than 1 specify the message priority when sending (where 0 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
+| *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
 | *replyToConcurrentConsumers* (producer) | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. | 1 | int
 | *replyToMaxConcurrentConsumers* (producer) | Specifies the maximum number of concurrent consumers when using request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. |  | int
 | *replyToOnTimeoutMaxConcurrent{zwsp}Consumers* (producer) | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS. | 1 | int
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-batch-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-batch-component.adoc
deleted file mode 100644
index 28037ad..0000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-batch-component.adoc
+++ /dev/null
@@ -1,207 +0,0 @@
-[[sjms-batch-component]]
-= Simple JMS Batch Component
-:docTitle: Simple JMS Batch
-:artifactId: camel-sjms
-:description: Highly performant and transactional batch consumption of messages from a JMS queue.
-:since: 2.16
-:supportLevel: Stable
-:component-header: Only consumer is supported
-include::{cq-version}@camel-quarkus:ROOT:partial$reference/components/sjms-batch.adoc[opts=optional]
-
-*Since Camel {since}*
-
-*{component-header}*
-
-SJMS Batch is a specialized component for highly performant,
-transactional batch consumption from a JMS queue. It can be thought of
-as a hybrid of a consumer-only component and an
-aggregator.
-
-A common use case in Camel is to consume messages from a queue and
-aggregate them before sending the aggregated state to another endpoint.
-In order to ensure that data is not lost if the system performing the
-processing fails, it is typically consumed within a transaction from the
-queue, and once aggregated stored in a persistent
-`AggregationRepository`, such as the one found in the
-xref:jdbc-component.adoc[JDBC Component].
-
-The behavior of the aggregator pattern involves fetching data from the
-`AggregationRepository` before an incoming message is aggregated, and
-writing back the result afterwards. By nature, the reads and writes take
-progressively longer as the number of aggregated artifacts increases. A
-rough example of this using arbitrary time units that demonstrates the
-impact of this is as follows:
-
-[cols=",,,",options="header",]
-|=======================================
-|Item |Read Time |Write Time |Total Time
-|0 |0 |1 |1
-|1 |1 |2 |4
-|2 |2 |3 |9
-|3 |3 |4 |16
-|4 |4 |5 |25
-|5 |5 |6 |36
-|6 |6 |7 |49
-|7 |7 |8 |64
-|8 |8 |9 |81
-|9 |9 |10 |100
-|=======================================
-
-In contrast, consumption performance using the SJMS Batch component is
-linear. Each message is consumed and aggregated using an
-`AggregationStrategy` before the next one is fetched. As all of the
-consumption and aggregation is performed in a single JMS transaction no
-external storage is required to persist the intermediate state - this
-avoids the read and write costs described above. In practice, this
-yields multiple orders of magnitude higher throughput.
-
-Once a completion condition is met, either by size or period since first
-message, the aggregated `Exchange` is passed into the route. During the
-processing of this `Exchange`, if an exception is thrown or the system
-shuts down, all of the original consumed messages end up back on the
-queue (or are placed on the dead-letter queue depending on the broker
-configuration).
-
-Unlike using a regular aggregator, there is no facility for an
-aggregation condition, meaning that it is not possible to batch consume
-into multiple groups of messages. All consumed messages are aggregated
-together into a single batch.
-
-Multiple JMS consumer support is available which allows you to consume
-in parallel using the one route, and at the same time use facilities
-like JMS message groups to group related messages.
-
-Maven users will need to add the following dependency to their `pom.xml`
-for this component:
-
-[source,xml]
-----
-<dependency>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>camel-sjms</artifactId>
-    <version>x.x.x</version>
-    <!-- use the same version as your Camel core version -->
-</dependency>
-----
-
-== URI format
-
-[source]
-----
-sjms:[queue:]destinationName[?options]
-----
-
-Where `destinationName` is a JMS queue. By default, the
-`destinationName` is interpreted as a queue name.
-
-[source]
-----
-sjms:FOO.BAR
-----
-
-You can include the optional `queue:` prefix, if you prefer:
-
-[source]
-----
-sjms:queue:FOO.BAR
-----
-
-Topic consumption is not supported, as there is no advantage to using
-batch consumption within that context. Topic messages are usually
-non-persistent, and loss is acceptable. If consumed within a transaction
-that fails, a topic message will likely not be redelivered by the
-broker. A plain xref:sjms-component.adoc[SJMS] consumer endpoint can be used in
-conjunction with a regular non-persistence backed
-aggregator in this scenario.
-
-== Component Options and Configurations
-
-
-
-
-// component options: START
-The Simple JMS Batch component supports 6 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
-| *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
-| *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
-| *connectionFactory* (advanced) | A ConnectionFactory is required to enable the SjmsBatchComponent. |  | ConnectionFactory
-| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | int
-| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
-|===
-// component options: END
-
-
-
-
-
-
-
-
-
-// endpoint options: START
-The Simple JMS Batch endpoint is configured using URI syntax:
-
-----
-sjms-batch:destinationName
-----
-
-with the following path and query parameters:
-
-=== Path Parameters (1 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *destinationName* | *Required* The destination name. Only queues are supported, names may be prefixed by 'queue:'. |  | String
-|===
-
-
-=== Query Parameters (23 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *aggregationStrategy* (consumer) | *Required* The aggregation strategy to use, which merges all the batched messages into a single message |  | AggregationStrategy
-| *allowNullBody* (consumer) | 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
-| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
-| *completionInterval* (consumer) | The completion interval in millis, which causes batches to be completed in a scheduled fixed rate every interval. The batch may be empty if the timeout triggered and there was no messages in the batch. Notice you cannot use both completion timeout and completion interval at the same time, only one can be configured. | 1000 | int
-| *completionPredicate* (consumer) | The completion predicate, which causes batches to be completed when the predicate evaluates as true. The predicate can also be configured using the simple language using the string syntax. You may want to set the option eagerCheckCompletion to true to let the predicate match the incoming message, as otherwise it matches the aggregated message. |  | String
-| *completionSize* (consumer) | The number of messages consumed at which the batch will be completed | 200 | int
-| *completionTimeout* (consumer) | The timeout in millis from receipt of the first first message when the batch will be completed. The batch may be empty if the timeout triggered and there was no messages in the batch. Notice you cannot use both completion timeout and completion interval at the same time, only one can be configured. | 500 | int
-| *consumerCount* (consumer) | The number of JMS sessions to consume from | 1 | int
-| *eagerCheckCompletion* (consumer) | Use eager completion checking which means that the completionPredicate will use the incoming Exchange. As opposed to without eager completion checking the completionPredicate will use the aggregated Exchange. | false | boolean
-| *includeAllJMSXProperties* (consumer) | 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
-| *mapJmsMessage* (consumer) | Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc. See section about how mapping works below for more details. | true | boolean
-| *pollDuration* (consumer) | The duration in milliseconds of each poll for messages. completionTimeOut will be used if it is shorter and a batch has started. | 1000 | int
-| *sendEmptyMessageWhenIdle* (consumer) | If using completion timeout or interval, then the batch may be empty if the timeout triggered and there was no messages in the batch. If this option is true and the batch is empty then an empty message is added to the batch so an empty message is routed. | false | boolean
-| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
-| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
-| *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
-| *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
-| *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 [...]
-| *keepAliveDelay* (advanced) | The delay in millis between attempts to re-establish a valid session. If this is a positive value the SjmsBatchConsumer will attempt to create a new session if it sees an Exception during message consumption. This delay value allows you to pause between attempts to prevent spamming the logs. If this is a negative value then the SjmsBatchConsumer will bail out and the consumer will not stop consuming new messages. The default is 5000 ms, that is, 5 seconds. [...]
-| *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
-| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | int
-| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *timeoutCheckerExecutorService* (advanced) | If using the completionInterval option a background thread is created to trigger the completion interval. Set this option to provide a custom thread pool to be used rather than creating a new thread for every consumer. |  | ScheduledExecutorService
-|===
-// endpoint options: END
-
-
-
-
-
-
-The `completionSize` endpoint attribute is used in conjunction with
-`completionTimeout`, where the first condition to be met will cause the
-aggregated `Exchange` to be emitted down the route.
-
-include::camel-spring-boot::page$sjms-starter.adoc[]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc
index 931c813..20de46e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc
@@ -18,6 +18,8 @@ and configuration. SJMS contains a brand new JMS client API written
 explicitly for Camel eliminating third party messaging implementations
 keeping it light and resilient. The following features is included:
 
+// TODO: Update this after refactor
+
 * Standard Queue and Topic Support (Durable & Non-Durable)
 * InOnly & InOut MEP Support
 * Asynchronous Producer and Consumer Processing
@@ -27,8 +29,6 @@ Additional key features include:
 
 * Plugable Connection Resource Management
 * Session, Consumer, & Producer Pooling & Caching Management
-* Batch Consumers
-* Transacted Batch Consumers (*deprecated*)
 * Support for Customizable Transaction Commit Strategies (Local JMS
 Transactions only)
 
@@ -90,7 +90,7 @@ You append query options to the URI using the following format,
 == Component Options and Configurations
 
 // component options: START
-The Simple JMS component supports 19 options, which are listed below.
+The Simple JMS component supports 18 options, which are listed below.
 
 
 
@@ -111,7 +111,6 @@ The Simple JMS component supports 19 options, which are listed below.
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *jmsKeyFormatStrategy* (advanced) | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The default strategy will safely marshal dots and hyphens (. and -). 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  [...]
 | *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
-| *timedTaskManager* (advanced) | To use a custom TimedTaskManager |  | TimedTaskManager
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *connectionPassword* (security) | The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
 | *connectionUsername* (security) | The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
@@ -140,33 +139,38 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (37 parameters):
+=== Query Parameters (40 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *acknowledgementMode* (common) | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. There are 4 enums and the value can be one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | SessionAcknowledgementType
+| *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message broker [...]
+| *replyTo* (common) | Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer). |  | String
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *consumerCount* (consumer) | Sets the number of consumer listeners used for this endpoint. | 1 | int
 | *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
 | *reconnectBackOff* (consumer) | Backoff in millis on consumer pool reconnection attempts | 5000 | long
 | *reconnectOnError* (consumer) | Try to apply reconnection logic on consumer pool | true | boolean
+| *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
 | *synchronous* (consumer) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | true | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
 | *messageSelector* (consumer) | Sets the JMS Message selector syntax. |  | String
+| *deliveryMode* (producer) | Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2. There are 2 enums and the value can be one of: 1, 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
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *namedReplyTo* (producer) | Sets the reply to destination name used for InOut producer endpoints. The type of the reply to destination can be determined by the starting prefix (topic: or queue:) in its name. |  | String
-| *persistent* (producer) | Flag used to enable/disable message persistence. | true | boolean
-| *producerCount* (producer) | Sets the number of producers used for this endpoint. | 1 | int
-| *ttl* (producer) | Flag used to adjust the Time To Live value of produced messages. | -1 | long
+| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
+| *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
+| *replyToOverride* (producer) | Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination. |  | String
+| *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
 | *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
-| *prefillPool* (producer) | Whether to prefill the producer connection pool on startup, or create connections lazy when needed. | true | boolean
-| *responseTimeOut* (producer) | Sets the amount of time we should wait before timing out a InOut response. | 5s | long
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
-| *connectionCount* (advanced) | The maximum number of connections available to this endpoint |  | Integer
+| *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
 | *connectionFactory* (advanced) | Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any |  | ConnectionFactory
 | *connectionResource* (advanced) | Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any |  | ConnectionResource
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
@@ -179,8 +183,6 @@ with the following path and query parameters:
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
-| *transactionBatchCount* (transaction) | *Deprecated* If transacted sets the number of messages to process before committing a transaction. | -1 | int
-| *transactionBatchTimeout* (transaction) | *Deprecated* Sets timeout (in millis) for batch transactions, the value should be 1000 or higher. | 5s | long
 | *transactionCommitStrategy* (transaction) | Sets the commit strategy. |  | TransactionCommitStrategy
 | *sharedJMSSession* (transaction) | Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS providers, use jms component to leverage XA transaction. | true | boolean
 |===
@@ -240,13 +242,13 @@ from("direct:start")
     .to("sjms:queue:bar?exchangePattern=InOut");
 ----
 
-You can specify a `namedReplyTo` though which can provide a better
+You can specify a `replyTo` though which can provide a better
 monitor point.
 
 [source,java]
 ----
 from("direct:start")
-    .to("sjms:queue:bar?exchangePattern=InOut&namedReplyTo=my.reply.to.queue");
+    .to("sjms:queue:bar?replyTo=my.reply.to.queue");
 ----
 
 == Consumer Usage
@@ -423,57 +425,6 @@ transaction strategy through the use of the `TransactionCommitStrategy`
 interface. This allows a user to define a unique set of circumstances
 that the `SessionTransactionSynchronization`
 will use to determine when to commit the Session.
-An example of its use is the `BatchTransactionCommitStrategy`
-which is detailed further in the next section.
-
-=== Transacted Batch Consumers
-
-WARNING: This feature is deprecated because under some situations with race conditions then
-transactions that are committed via a timeout may not work correctly.
-
-The SJMS component has been designed to support the batching of local JMS
-transactions on the consumer endpoints. How they are
-handled on each is very different though.
-
-The SJMS consumer endpoint is a straightforward implementation that will
-process X messages before committing them with the associated Session.
-To enable batched transaction on the consumer first enable transactions
-by setting the `transacted` parameter to true and then adding the
-`transactionBatchCount` and setting it to any value that is greater than
-0. For example the following configuration will commit the Session every
-10 messages:
-
-[source,text]
-----
-sjms:queue:transacted.batch.consumer?transacted=true&transactionBatchCount=10
-----
-
-If an exception occurs during the processing of a batch on the consumer
-endpoint, the Session rollback is invoked causing the messages to be
-redelivered to the next available consumer. The counter is also reset to
-0 for the `BatchTransactionCommitStrategy` for the associated Session as
-well. It is the responsibility of the user to ensure they put hooks in
-their processors of batch messages to watch for messages with the
-JMSRedelivered header set to true. This is the indicator that messages
-were rolled back at some point and that a verification of a successful
-processing should occur.
-
-A transacted batch consumer also carries with it an instance of an
-internal timer that waits a default amount of time (5000ms) between
-messages before committing the open transactions on the Session. The
-default value of 5000ms (minimum of 1000ms) should be adequate for most
-use-cases but if further tuning is necessary simply set the
-`transactionBatchTimeout` parameter.
-
-[source,text]
-----
-sjms:queue:transacted.batch.consumer?transacted=true&transactionBatchCount=10&transactionBatchTimeout=2000
-----
-
-The minimal value that will be accepted is 1000ms as the amount of
-context switching may cause unnecessary performance impacts without
-gaining benefit.
-
 
 == Additional Notes
 
@@ -542,9 +493,9 @@ Not at all. Below is an example of the SJMS component using the Spring XML:
 
 [source,xml]
 ----
-<route id="inout.named.reply.to.producer.route">
+<route>
     <from uri="direct:invoke.named.reply.to.queue" />
-    <to uri="sjms:queue:named.reply.to.queue?namedReplyTo=my.response.queue&amp;exchangePattern=InOut" />
+    <to uri="sjms:queue:named.reply.to.queue?namedReplyTo=my.response.queue" />
 </route>
 ----
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms2-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms2-component.adoc
index 342919f..133a721 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms2-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms2-component.adoc
@@ -93,7 +93,7 @@ You append query options to the URI using the following format,
 
 
 // component options: START
-The Simple JMS2 component supports 19 options, which are listed below.
+The Simple JMS2 component supports 18 options, which are listed below.
 
 
 
@@ -114,7 +114,6 @@ The Simple JMS2 component supports 19 options, which are listed below.
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *jmsKeyFormatStrategy* (advanced) | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The default strategy will safely marshal dots and hyphens (. and -). 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  [...]
 | *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
-| *timedTaskManager* (advanced) | To use a custom TimedTaskManager |  | TimedTaskManager
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *connectionPassword* (security) | The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
 | *connectionUsername* (security) | The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
@@ -149,36 +148,41 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (40 parameters):
+=== Query Parameters (43 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *acknowledgementMode* (common) | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. There are 4 enums and the value can be one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | SessionAcknowledgementType
+| *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message broker [...]
+| *replyTo* (common) | Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer). |  | String
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *consumerCount* (consumer) | Sets the number of consumer listeners used for this endpoint. | 1 | int
 | *durable* (consumer) | Sets topic consumer to durable. | false | boolean
 | *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
 | *reconnectBackOff* (consumer) | Backoff in millis on consumer pool reconnection attempts | 5000 | long
 | *reconnectOnError* (consumer) | Try to apply reconnection logic on consumer pool | true | boolean
+| *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
 | *shared* (consumer) | Sets the consumer to shared. | false | boolean
 | *subscriptionId* (consumer) | Sets the subscription Id, required for durable or shared topics. |  | String
 | *synchronous* (consumer) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | true | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
 | *messageSelector* (consumer) | Sets the JMS Message selector syntax. |  | String
+| *deliveryMode* (producer) | Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2. There are 2 enums and the value can be one of: 1, 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
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *namedReplyTo* (producer) | Sets the reply to destination name used for InOut producer endpoints. The type of the reply to destination can be determined by the starting prefix (topic: or queue:) in its name. |  | String
-| *persistent* (producer) | Flag used to enable/disable message persistence. | true | boolean
-| *producerCount* (producer) | Sets the number of producers used for this endpoint. | 1 | int
-| *ttl* (producer) | Flag used to adjust the Time To Live value of produced messages. | -1 | long
+| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
+| *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
+| *replyToOverride* (producer) | Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination. |  | String
+| *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
 | *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
-| *prefillPool* (producer) | Whether to prefill the producer connection pool on startup, or create connections lazy when needed. | true | boolean
-| *responseTimeOut* (producer) | Sets the amount of time we should wait before timing out a InOut response. | 5s | long
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
-| *connectionCount* (advanced) | The maximum number of connections available to this endpoint |  | Integer
+| *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
 | *connectionFactory* (advanced) | Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any |  | ConnectionFactory
 | *connectionResource* (advanced) | Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any |  | ConnectionResource
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
@@ -191,8 +195,6 @@ with the following path and query parameters:
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
-| *transactionBatchCount* (transaction) | *Deprecated* If transacted sets the number of messages to process before committing a transaction. | -1 | int
-| *transactionBatchTimeout* (transaction) | *Deprecated* Sets timeout (in millis) for batch transactions, the value should be 1000 or higher. | 5s | long
 | *transactionCommitStrategy* (transaction) | Sets the commit strategy. |  | TransactionCommitStrategy
 | *sharedJMSSession* (transaction) | Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS providers, use jms component to leverage XA transaction. | true | boolean
 |===
@@ -256,13 +258,13 @@ from("direct:start")
     .to("sjms2:queue:bar?exchangePattern=InOut");
 ----
 
-You can specify a `namedReplyTo` though which can provide a better
+You can specify a `replyTo` though which can provide a better
 monitor point.
 
 [source,java]
 ----
 from("direct:start")
-    .to("sjms2:queue:bar?exchangePattern=InOut&namedReplyTo=my.reply.to.queue");
+    .to("sjms2:queue:bar?replyTo=my.reply.to.queue");
 ----
 
 == Consumer Usage
@@ -570,17 +572,13 @@ Transaction API (JTA).
 
 === Does Springless Mean I Can't Use Spring?
 
-Not at all. Below is an example of the SJMS2 component using the Spring
-DSL:
+Not at all. Below is an example of the SJMS2 component using the XML DSL:
 
-[source,java]
+[source,xml]
 ----
-<route
-    id="inout.named.reply.to.producer.route">
-    <from
-        uri="direct:invoke.named.reply.to.queue" />
-    <to
-        uri="sjms2:queue:named.reply.to.queue?namedReplyTo=my.response.queue&amp;exchangePattern=InOut" />
+<route>
+    <from uri="direct:invoke.named.reply.to.queue" />
+    <to uri="sjms2:queue:named.reply.to.queue?replyTo=my.response.queue" />
 </route>
 ----
 
diff --git a/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json b/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json
index 810c6ed..4091f48 100644
--- a/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json
+++ b/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json
@@ -58,7 +58,7 @@
     "formatDateHeadersToIso8601": { "kind": "property", "displayName": "Format Date Headers To Iso8601", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether JMS date properties should be formatted according to the ISO 8 [...]
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
     "preserveMessageQos": { "kind": "property", "displayName": "Preserve Message Qos", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set to true, if you want to send message using the QoS settings specified on the message, ins [...]
-    "priority": { "kind": "property", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Values greater than 1 specify the message priority when sending (w [...]
+    "priority": { "kind": "property", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Values greater than 1 specify the message priority when sending (w [...]
     "replyToConcurrentConsumers": { "kind": "property", "displayName": "Reply To Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the default number of concurrent consumers when doing request\/reply over  [...]
     "replyToMaxConcurrentConsumers": { "kind": "property", "displayName": "Reply To Max Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the maximum number of concurrent consumers when using request\/reply over JMS. See als [...]
     "replyToOnTimeoutMaxConcurrentConsumers": { "kind": "property", "displayName": "Reply To On Timeout Max Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the maximum number of concurrent consumers for  [...]
@@ -160,7 +160,7 @@
     "formatDateHeadersToIso8601": { "kind": "parameter", "displayName": "Format Date Headers To Iso8601", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether JMS date properties should be formatted according to the ISO  [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
     "preserveMessageQos": { "kind": "parameter", "displayName": "Preserve Message Qos", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set to true, if you want to send message using the QoS settings specified on the message, in [...]
-    "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Values greater than 1 specify the message priority when sending ( [...]
+    "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Values greater than 1 specify the message priority when sending ( [...]
     "replyToConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the default number of concurrent consumers when doing request\/reply over [...]
     "replyToMaxConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To Max Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the maximum number of concurrent consumers when using request\/reply over JMS. See al [...]
     "replyToOnTimeoutMaxConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To On Timeout Max Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the maximum number of concurrent consumers for [...]
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc b/components/camel-jms/src/main/docs/jms-component.adoc
index 0a6a19e..b3fd3f7 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -229,7 +229,7 @@ The JMS component supports 96 options, which are listed below.
 | *formatDateHeadersToIso8601* (producer) | Sets whether JMS date properties should be formatted according to the ISO 8601 standard. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
-| *priority* (producer) | Values greater than 1 specify the message priority when sending (where 0 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
+| *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
 | *replyToConcurrentConsumers* (producer) | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. | 1 | int
 | *replyToMaxConcurrentConsumers* (producer) | Specifies the maximum number of concurrent consumers when using request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. |  | int
 | *replyToOnTimeoutMaxConcurrent{zwsp}Consumers* (producer) | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS. | 1 | int
@@ -373,7 +373,7 @@ with the following path and query parameters:
 | *formatDateHeadersToIso8601* (producer) | Sets whether JMS date properties should be formatted according to the ISO 8601 standard. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
-| *priority* (producer) | Values greater than 1 specify the message priority when sending (where 0 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
+| *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
 | *replyToConcurrentConsumers* (producer) | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. | 1 | int
 | *replyToMaxConcurrentConsumers* (producer) | Specifies the maximum number of concurrent consumers when using request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. |  | int
 | *replyToOnTimeoutMaxConcurrent{zwsp}Consumers* (producer) | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS. | 1 | int
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 ee8bd6d..d6750b6 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
@@ -247,7 +247,7 @@ public class JmsConfiguration implements Cloneable {
                             + "the timestamp must be set to its normal value.")
     private boolean messageTimestampEnabled = true;
     @UriParam(defaultValue = "" + Message.DEFAULT_PRIORITY, enums = "1,2,3,4,5,6,7,8,9", label = "producer",
-              description = "Values greater than 1 specify the message priority when sending (where 0 is the lowest priority and 9 is the highest)."
+              description = "Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest)."
                             + " The explicitQosEnabled option must also be enabled in order for this option to have any effect.")
     private int priority = Message.DEFAULT_PRIORITY;
     // Transaction related configuration
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java
index a992f33..7845805 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java
@@ -55,8 +55,6 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "reconnectBackOff": target.setReconnectBackOff(property(camelContext, long.class, value)); return true;
         case "reconnectonerror":
         case "reconnectOnError": target.setReconnectOnError(property(camelContext, boolean.class, value)); return true;
-        case "timedtaskmanager":
-        case "timedTaskManager": target.setTimedTaskManager(property(camelContext, org.apache.camel.component.sjms.taskmanager.TimedTaskManager.class, value)); return true;
         case "transactioncommitstrategy":
         case "transactionCommitStrategy": target.setTransactionCommitStrategy(property(camelContext, org.apache.camel.component.sjms.TransactionCommitStrategy.class, value)); return true;
         default: return false;
@@ -105,8 +103,6 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "reconnectBackOff": return long.class;
         case "reconnectonerror":
         case "reconnectOnError": return boolean.class;
-        case "timedtaskmanager":
-        case "timedTaskManager": return org.apache.camel.component.sjms.taskmanager.TimedTaskManager.class;
         case "transactioncommitstrategy":
         case "transactionCommitStrategy": return org.apache.camel.component.sjms.TransactionCommitStrategy.class;
         default: return null;
@@ -151,8 +147,6 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "reconnectBackOff": return target.getReconnectBackOff();
         case "reconnectonerror":
         case "reconnectOnError": return target.isReconnectOnError();
-        case "timedtaskmanager":
-        case "timedTaskManager": return target.getTimedTaskManager();
         case "transactioncommitstrategy":
         case "transactionCommitStrategy": return target.getTransactionCommitStrategy();
         default: return null;
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java
index 84069e4..31c7005 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java
@@ -39,8 +39,14 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "connectionResource": target.setConnectionResource(property(camelContext, org.apache.camel.component.sjms.jms.ConnectionResource.class, value)); return true;
         case "consumercount":
         case "consumerCount": target.setConsumerCount(property(camelContext, int.class, value)); return true;
+        case "deliverymode":
+        case "deliveryMode": target.setDeliveryMode(property(camelContext, java.lang.Integer.class, value)); return true;
+        case "deliverypersistent":
+        case "deliveryPersistent": target.setDeliveryPersistent(property(camelContext, boolean.class, value)); return true;
         case "destinationcreationstrategy":
         case "destinationCreationStrategy": target.setDestinationCreationStrategy(property(camelContext, org.apache.camel.component.sjms.jms.DestinationCreationStrategy.class, value)); return true;
+        case "disablereplyto":
+        case "disableReplyTo": target.setDisableReplyTo(property(camelContext, boolean.class, value)); return true;
         case "durablesubscriptionid":
         case "durableSubscriptionId": target.setDurableSubscriptionId(property(camelContext, java.lang.String.class, value)); return true;
         case "errorhandlerlogstacktrace":
@@ -53,6 +59,8 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "exceptionListener": target.setExceptionListener(property(camelContext, javax.jms.ExceptionListener.class, value)); return true;
         case "exchangepattern":
         case "exchangePattern": target.setExchangePattern(property(camelContext, org.apache.camel.ExchangePattern.class, value)); return true;
+        case "explicitqosenabled":
+        case "explicitQosEnabled": target.setExplicitQosEnabled(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "headerfilterstrategy":
         case "headerFilterStrategy": target.setHeaderFilterStrategy(property(camelContext, org.apache.camel.spi.HeaderFilterStrategy.class, value)); return true;
         case "includealljmsxproperties":
@@ -67,30 +75,29 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "messageCreatedStrategy": target.setMessageCreatedStrategy(property(camelContext, org.apache.camel.component.sjms.jms.MessageCreatedStrategy.class, value)); return true;
         case "messageselector":
         case "messageSelector": target.setMessageSelector(property(camelContext, java.lang.String.class, value)); return true;
-        case "namedreplyto":
-        case "namedReplyTo": target.setNamedReplyTo(property(camelContext, java.lang.String.class, value)); return true;
-        case "persistent": target.setPersistent(property(camelContext, boolean.class, value)); return true;
-        case "prefillpool":
-        case "prefillPool": target.setPrefillPool(property(camelContext, boolean.class, value)); return true;
-        case "producercount":
-        case "producerCount": target.setProducerCount(property(camelContext, int.class, value)); return true;
+        case "preservemessageqos":
+        case "preserveMessageQos": target.setPreserveMessageQos(property(camelContext, boolean.class, value)); return true;
+        case "priority": target.setPriority(property(camelContext, int.class, value)); return true;
         case "reconnectbackoff":
         case "reconnectBackOff": target.setReconnectBackOff(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
         case "reconnectonerror":
         case "reconnectOnError": target.setReconnectOnError(property(camelContext, boolean.class, value)); return true;
-        case "responsetimeout":
-        case "responseTimeOut": target.setResponseTimeOut(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
+        case "replyto":
+        case "replyTo": target.setReplyTo(property(camelContext, java.lang.String.class, value)); return true;
+        case "replytodeliverypersistent":
+        case "replyToDeliveryPersistent": target.setReplyToDeliveryPersistent(property(camelContext, boolean.class, value)); return true;
+        case "replytooverride":
+        case "replyToOverride": target.setReplyToOverride(property(camelContext, java.lang.String.class, value)); return true;
+        case "requesttimeout":
+        case "requestTimeout": target.setRequestTimeout(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
         case "sharedjmssession":
         case "sharedJMSSession": target.setSharedJMSSession(property(camelContext, boolean.class, value)); return true;
         case "synchronous": target.setSynchronous(property(camelContext, boolean.class, value)); return true;
+        case "timetolive":
+        case "timeToLive": target.setTimeToLive(property(camelContext, long.class, value)); return true;
         case "transacted": target.setTransacted(property(camelContext, boolean.class, value)); return true;
-        case "transactionbatchcount":
-        case "transactionBatchCount": target.setTransactionBatchCount(property(camelContext, int.class, value)); return true;
-        case "transactionbatchtimeout":
-        case "transactionBatchTimeout": target.setTransactionBatchTimeout(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
         case "transactioncommitstrategy":
         case "transactionCommitStrategy": target.setTransactionCommitStrategy(property(camelContext, org.apache.camel.component.sjms.TransactionCommitStrategy.class, value)); return true;
-        case "ttl": target.setTtl(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
         default: return false;
         }
     }
@@ -116,8 +123,14 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "connectionResource": return org.apache.camel.component.sjms.jms.ConnectionResource.class;
         case "consumercount":
         case "consumerCount": return int.class;
+        case "deliverymode":
+        case "deliveryMode": return java.lang.Integer.class;
+        case "deliverypersistent":
+        case "deliveryPersistent": return boolean.class;
         case "destinationcreationstrategy":
         case "destinationCreationStrategy": return org.apache.camel.component.sjms.jms.DestinationCreationStrategy.class;
+        case "disablereplyto":
+        case "disableReplyTo": return boolean.class;
         case "durablesubscriptionid":
         case "durableSubscriptionId": return java.lang.String.class;
         case "errorhandlerlogstacktrace":
@@ -130,6 +143,8 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "exceptionListener": return javax.jms.ExceptionListener.class;
         case "exchangepattern":
         case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "explicitqosenabled":
+        case "explicitQosEnabled": return java.lang.Boolean.class;
         case "headerfilterstrategy":
         case "headerFilterStrategy": return org.apache.camel.spi.HeaderFilterStrategy.class;
         case "includealljmsxproperties":
@@ -144,30 +159,29 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "messageCreatedStrategy": return org.apache.camel.component.sjms.jms.MessageCreatedStrategy.class;
         case "messageselector":
         case "messageSelector": return java.lang.String.class;
-        case "namedreplyto":
-        case "namedReplyTo": return java.lang.String.class;
-        case "persistent": return boolean.class;
-        case "prefillpool":
-        case "prefillPool": return boolean.class;
-        case "producercount":
-        case "producerCount": return int.class;
+        case "preservemessageqos":
+        case "preserveMessageQos": return boolean.class;
+        case "priority": return int.class;
         case "reconnectbackoff":
         case "reconnectBackOff": return long.class;
         case "reconnectonerror":
         case "reconnectOnError": return boolean.class;
-        case "responsetimeout":
-        case "responseTimeOut": return long.class;
+        case "replyto":
+        case "replyTo": return java.lang.String.class;
+        case "replytodeliverypersistent":
+        case "replyToDeliveryPersistent": return boolean.class;
+        case "replytooverride":
+        case "replyToOverride": return java.lang.String.class;
+        case "requesttimeout":
+        case "requestTimeout": return long.class;
         case "sharedjmssession":
         case "sharedJMSSession": return boolean.class;
         case "synchronous": return boolean.class;
+        case "timetolive":
+        case "timeToLive": return long.class;
         case "transacted": return boolean.class;
-        case "transactionbatchcount":
-        case "transactionBatchCount": return int.class;
-        case "transactionbatchtimeout":
-        case "transactionBatchTimeout": return long.class;
         case "transactioncommitstrategy":
         case "transactionCommitStrategy": return org.apache.camel.component.sjms.TransactionCommitStrategy.class;
-        case "ttl": return long.class;
         default: return null;
         }
     }
@@ -194,8 +208,14 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "connectionResource": return target.getConnectionResource();
         case "consumercount":
         case "consumerCount": return target.getConsumerCount();
+        case "deliverymode":
+        case "deliveryMode": return target.getDeliveryMode();
+        case "deliverypersistent":
+        case "deliveryPersistent": return target.isDeliveryPersistent();
         case "destinationcreationstrategy":
         case "destinationCreationStrategy": return target.getDestinationCreationStrategy();
+        case "disablereplyto":
+        case "disableReplyTo": return target.isDisableReplyTo();
         case "durablesubscriptionid":
         case "durableSubscriptionId": return target.getDurableSubscriptionId();
         case "errorhandlerlogstacktrace":
@@ -208,6 +228,8 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "exceptionListener": return target.getExceptionListener();
         case "exchangepattern":
         case "exchangePattern": return target.getExchangePattern();
+        case "explicitqosenabled":
+        case "explicitQosEnabled": return target.getExplicitQosEnabled();
         case "headerfilterstrategy":
         case "headerFilterStrategy": return target.getHeaderFilterStrategy();
         case "includealljmsxproperties":
@@ -222,30 +244,29 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "messageCreatedStrategy": return target.getMessageCreatedStrategy();
         case "messageselector":
         case "messageSelector": return target.getMessageSelector();
-        case "namedreplyto":
-        case "namedReplyTo": return target.getNamedReplyTo();
-        case "persistent": return target.isPersistent();
-        case "prefillpool":
-        case "prefillPool": return target.isPrefillPool();
-        case "producercount":
-        case "producerCount": return target.getProducerCount();
+        case "preservemessageqos":
+        case "preserveMessageQos": return target.isPreserveMessageQos();
+        case "priority": return target.getPriority();
         case "reconnectbackoff":
         case "reconnectBackOff": return target.getReconnectBackOff();
         case "reconnectonerror":
         case "reconnectOnError": return target.isReconnectOnError();
-        case "responsetimeout":
-        case "responseTimeOut": return target.getResponseTimeOut();
+        case "replyto":
+        case "replyTo": return target.getReplyTo();
+        case "replytodeliverypersistent":
+        case "replyToDeliveryPersistent": return target.isReplyToDeliveryPersistent();
+        case "replytooverride":
+        case "replyToOverride": return target.getReplyToOverride();
+        case "requesttimeout":
+        case "requestTimeout": return target.getRequestTimeout();
         case "sharedjmssession":
         case "sharedJMSSession": return target.isSharedJMSSession();
         case "synchronous": return target.isSynchronous();
+        case "timetolive":
+        case "timeToLive": return target.getTimeToLive();
         case "transacted": return target.isTransacted();
-        case "transactionbatchcount":
-        case "transactionBatchCount": return target.getTransactionBatchCount();
-        case "transactionbatchtimeout":
-        case "transactionBatchTimeout": return target.getTransactionBatchTimeout();
         case "transactioncommitstrategy":
         case "transactionCommitStrategy": return target.getTransactionCommitStrategy();
-        case "ttl": return target.getTtl();
         default: return null;
         }
     }
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java
index 0b77c86..48bbd31 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java
@@ -20,18 +20,20 @@ public class SjmsEndpointUriFactory extends org.apache.camel.support.component.E
     private static final Set<String> PROPERTY_NAMES;
     private static final Set<String> SECRET_PROPERTY_NAMES;
     static {
-        Set<String> props = new HashSet<>(39);
+        Set<String> props = new HashSet<>(42);
         props.add("reconnectBackOff");
         props.add("connectionCount");
         props.add("mapJmsMessage");
         props.add("synchronous");
         props.add("connectionResource");
         props.add("includeAllJMSXProperties");
+        props.add("explicitQosEnabled");
         props.add("transacted");
         props.add("errorHandlerLogStackTrace");
+        props.add("timeToLive");
         props.add("bridgeErrorHandler");
-        props.add("transactionBatchCount");
         props.add("jmsKeyFormatStrategy");
+        props.add("deliveryMode");
         props.add("headerFilterStrategy");
         props.add("exceptionListener");
         props.add("destinationName");
@@ -39,27 +41,28 @@ public class SjmsEndpointUriFactory extends org.apache.camel.support.component.E
         props.add("asyncStopListener");
         props.add("destinationType");
         props.add("asyncStartListener");
-        props.add("persistent");
+        props.add("requestTimeout");
         props.add("allowNullBody");
-        props.add("namedReplyTo");
+        props.add("replyToDeliveryPersistent");
+        props.add("disableReplyTo");
         props.add("reconnectOnError");
         props.add("consumerCount");
         props.add("destinationCreationStrategy");
         props.add("exchangePattern");
-        props.add("prefillPool");
         props.add("messageSelector");
-        props.add("ttl");
+        props.add("deliveryPersistent");
+        props.add("preserveMessageQos");
+        props.add("priority");
         props.add("acknowledgementMode");
-        props.add("transactionBatchTimeout");
         props.add("lazyStartProducer");
         props.add("transactionCommitStrategy");
         props.add("connectionFactory");
-        props.add("producerCount");
+        props.add("replyTo");
+        props.add("replyToOverride");
         props.add("errorHandlerLoggingLevel");
         props.add("sharedJMSSession");
         props.add("durableSubscriptionId");
         props.add("exceptionHandler");
-        props.add("responseTimeOut");
         PROPERTY_NAMES = Collections.unmodifiableSet(props);
         SECRET_PROPERTY_NAMES = Collections.emptySet();
     }
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchComponentConfigurer.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchComponentConfigurer.java
deleted file mode 100644
index 07cbb4b..0000000
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchComponentConfigurer.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.sjms.batch;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class SjmsBatchComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        SjmsBatchComponent target = (SjmsBatchComponent) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "asyncstartlistener":
-        case "asyncStartListener": target.setAsyncStartListener(property(camelContext, boolean.class, value)); return true;
-        case "autowiredenabled":
-        case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true;
-        case "bridgeerrorhandler":
-        case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
-        case "connectionfactory":
-        case "connectionFactory": target.setConnectionFactory(property(camelContext, javax.jms.ConnectionFactory.class, value)); return true;
-        case "headerfilterstrategy":
-        case "headerFilterStrategy": target.setHeaderFilterStrategy(property(camelContext, org.apache.camel.spi.HeaderFilterStrategy.class, value)); return true;
-        case "recoveryinterval":
-        case "recoveryInterval": target.setRecoveryInterval(property(camelContext, int.class, value)); return true;
-        default: return false;
-        }
-    }
-
-    @Override
-    public Class<?> getOptionType(String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "asyncstartlistener":
-        case "asyncStartListener": return boolean.class;
-        case "autowiredenabled":
-        case "autowiredEnabled": return boolean.class;
-        case "bridgeerrorhandler":
-        case "bridgeErrorHandler": return boolean.class;
-        case "connectionfactory":
-        case "connectionFactory": return javax.jms.ConnectionFactory.class;
-        case "headerfilterstrategy":
-        case "headerFilterStrategy": return org.apache.camel.spi.HeaderFilterStrategy.class;
-        case "recoveryinterval":
-        case "recoveryInterval": return int.class;
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        SjmsBatchComponent target = (SjmsBatchComponent) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "asyncstartlistener":
-        case "asyncStartListener": return target.isAsyncStartListener();
-        case "autowiredenabled":
-        case "autowiredEnabled": return target.isAutowiredEnabled();
-        case "bridgeerrorhandler":
-        case "bridgeErrorHandler": return target.isBridgeErrorHandler();
-        case "connectionfactory":
-        case "connectionFactory": return target.getConnectionFactory();
-        case "headerfilterstrategy":
-        case "headerFilterStrategy": return target.getHeaderFilterStrategy();
-        case "recoveryinterval":
-        case "recoveryInterval": return target.getRecoveryInterval();
-        default: return null;
-        }
-    }
-}
-
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointConfigurer.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointConfigurer.java
deleted file mode 100644
index 252c6ad..0000000
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointConfigurer.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.sjms.batch;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class SjmsBatchEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        SjmsBatchEndpoint target = (SjmsBatchEndpoint) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "aggregationstrategy":
-        case "aggregationStrategy": target.setAggregationStrategy(property(camelContext, org.apache.camel.AggregationStrategy.class, value)); return true;
-        case "allownullbody":
-        case "allowNullBody": target.setAllowNullBody(property(camelContext, boolean.class, value)); return true;
-        case "asyncstartlistener":
-        case "asyncStartListener": target.setAsyncStartListener(property(camelContext, boolean.class, value)); return true;
-        case "bridgeerrorhandler":
-        case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
-        case "completioninterval":
-        case "completionInterval": target.setCompletionInterval(property(camelContext, int.class, value)); return true;
-        case "completionpredicate":
-        case "completionPredicate": target.setCompletionPredicate(property(camelContext, java.lang.String.class, value)); return true;
-        case "completionsize":
-        case "completionSize": target.setCompletionSize(property(camelContext, int.class, value)); return true;
-        case "completiontimeout":
-        case "completionTimeout": target.setCompletionTimeout(property(camelContext, int.class, value)); return true;
-        case "consumercount":
-        case "consumerCount": target.setConsumerCount(property(camelContext, int.class, value)); return true;
-        case "eagercheckcompletion":
-        case "eagerCheckCompletion": target.setEagerCheckCompletion(property(camelContext, boolean.class, value)); return true;
-        case "exceptionhandler":
-        case "exceptionHandler": target.setExceptionHandler(property(camelContext, org.apache.camel.spi.ExceptionHandler.class, value)); return true;
-        case "exchangepattern":
-        case "exchangePattern": target.setExchangePattern(property(camelContext, org.apache.camel.ExchangePattern.class, value)); return true;
-        case "headerfilterstrategy":
-        case "headerFilterStrategy": target.setHeaderFilterStrategy(property(camelContext, org.apache.camel.spi.HeaderFilterStrategy.class, value)); return true;
-        case "includealljmsxproperties":
-        case "includeAllJMSXProperties": target.setIncludeAllJMSXProperties(property(camelContext, boolean.class, value)); return true;
-        case "jmskeyformatstrategy":
-        case "jmsKeyFormatStrategy": target.setJmsKeyFormatStrategy(property(camelContext, org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy.class, value)); return true;
-        case "keepalivedelay":
-        case "keepAliveDelay": target.setKeepAliveDelay(property(camelContext, int.class, value)); return true;
-        case "mapjmsmessage":
-        case "mapJmsMessage": target.setMapJmsMessage(property(camelContext, boolean.class, value)); return true;
-        case "messagecreatedstrategy":
-        case "messageCreatedStrategy": target.setMessageCreatedStrategy(property(camelContext, org.apache.camel.component.sjms.jms.MessageCreatedStrategy.class, value)); return true;
-        case "pollduration":
-        case "pollDuration": target.setPollDuration(property(camelContext, int.class, value)); return true;
-        case "recoveryinterval":
-        case "recoveryInterval": target.setRecoveryInterval(property(camelContext, int.class, value)); return true;
-        case "sendemptymessagewhenidle":
-        case "sendEmptyMessageWhenIdle": target.setSendEmptyMessageWhenIdle(property(camelContext, boolean.class, value)); return true;
-        case "synchronous": target.setSynchronous(property(camelContext, boolean.class, value)); return true;
-        case "timeoutcheckerexecutorservice":
-        case "timeoutCheckerExecutorService": target.setTimeoutCheckerExecutorService(property(camelContext, java.util.concurrent.ScheduledExecutorService.class, value)); return true;
-        default: return false;
-        }
-    }
-
-    @Override
-    public Class<?> getOptionType(String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "aggregationstrategy":
-        case "aggregationStrategy": return org.apache.camel.AggregationStrategy.class;
-        case "allownullbody":
-        case "allowNullBody": return boolean.class;
-        case "asyncstartlistener":
-        case "asyncStartListener": return boolean.class;
-        case "bridgeerrorhandler":
-        case "bridgeErrorHandler": return boolean.class;
-        case "completioninterval":
-        case "completionInterval": return int.class;
-        case "completionpredicate":
-        case "completionPredicate": return java.lang.String.class;
-        case "completionsize":
-        case "completionSize": return int.class;
-        case "completiontimeout":
-        case "completionTimeout": return int.class;
-        case "consumercount":
-        case "consumerCount": return int.class;
-        case "eagercheckcompletion":
-        case "eagerCheckCompletion": return boolean.class;
-        case "exceptionhandler":
-        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
-        case "exchangepattern":
-        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
-        case "headerfilterstrategy":
-        case "headerFilterStrategy": return org.apache.camel.spi.HeaderFilterStrategy.class;
-        case "includealljmsxproperties":
-        case "includeAllJMSXProperties": return boolean.class;
-        case "jmskeyformatstrategy":
-        case "jmsKeyFormatStrategy": return org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy.class;
-        case "keepalivedelay":
-        case "keepAliveDelay": return int.class;
-        case "mapjmsmessage":
-        case "mapJmsMessage": return boolean.class;
-        case "messagecreatedstrategy":
-        case "messageCreatedStrategy": return org.apache.camel.component.sjms.jms.MessageCreatedStrategy.class;
-        case "pollduration":
-        case "pollDuration": return int.class;
-        case "recoveryinterval":
-        case "recoveryInterval": return int.class;
-        case "sendemptymessagewhenidle":
-        case "sendEmptyMessageWhenIdle": return boolean.class;
-        case "synchronous": return boolean.class;
-        case "timeoutcheckerexecutorservice":
-        case "timeoutCheckerExecutorService": return java.util.concurrent.ScheduledExecutorService.class;
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        SjmsBatchEndpoint target = (SjmsBatchEndpoint) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "aggregationstrategy":
-        case "aggregationStrategy": return target.getAggregationStrategy();
-        case "allownullbody":
-        case "allowNullBody": return target.isAllowNullBody();
-        case "asyncstartlistener":
-        case "asyncStartListener": return target.isAsyncStartListener();
-        case "bridgeerrorhandler":
-        case "bridgeErrorHandler": return target.isBridgeErrorHandler();
-        case "completioninterval":
-        case "completionInterval": return target.getCompletionInterval();
-        case "completionpredicate":
-        case "completionPredicate": return target.getCompletionPredicate();
-        case "completionsize":
-        case "completionSize": return target.getCompletionSize();
-        case "completiontimeout":
-        case "completionTimeout": return target.getCompletionTimeout();
-        case "consumercount":
-        case "consumerCount": return target.getConsumerCount();
-        case "eagercheckcompletion":
-        case "eagerCheckCompletion": return target.isEagerCheckCompletion();
-        case "exceptionhandler":
-        case "exceptionHandler": return target.getExceptionHandler();
-        case "exchangepattern":
-        case "exchangePattern": return target.getExchangePattern();
-        case "headerfilterstrategy":
-        case "headerFilterStrategy": return target.getHeaderFilterStrategy();
-        case "includealljmsxproperties":
-        case "includeAllJMSXProperties": return target.isIncludeAllJMSXProperties();
-        case "jmskeyformatstrategy":
-        case "jmsKeyFormatStrategy": return target.getJmsKeyFormatStrategy();
-        case "keepalivedelay":
-        case "keepAliveDelay": return target.getKeepAliveDelay();
-        case "mapjmsmessage":
-        case "mapJmsMessage": return target.isMapJmsMessage();
-        case "messagecreatedstrategy":
-        case "messageCreatedStrategy": return target.getMessageCreatedStrategy();
-        case "pollduration":
-        case "pollDuration": return target.getPollDuration();
-        case "recoveryinterval":
-        case "recoveryInterval": return target.getRecoveryInterval();
-        case "sendemptymessagewhenidle":
-        case "sendEmptyMessageWhenIdle": return target.isSendEmptyMessageWhenIdle();
-        case "synchronous": return target.isSynchronous();
-        case "timeoutcheckerexecutorservice":
-        case "timeoutCheckerExecutorService": return target.getTimeoutCheckerExecutorService();
-        default: return null;
-        }
-    }
-}
-
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriFactory.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriFactory.java
deleted file mode 100644
index 301ea98..0000000
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.sjms.batch;
-
-import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.camel.spi.EndpointUriFactory;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class SjmsBatchEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
-
-    private static final String BASE = ":destinationName";
-
-    private static final Set<String> PROPERTY_NAMES;
-    private static final Set<String> SECRET_PROPERTY_NAMES;
-    static {
-        Set<String> props = new HashSet<>(24);
-        props.add("aggregationStrategy");
-        props.add("mapJmsMessage");
-        props.add("consumerCount");
-        props.add("recoveryInterval");
-        props.add("synchronous");
-        props.add("sendEmptyMessageWhenIdle");
-        props.add("includeAllJMSXProperties");
-        props.add("pollDuration");
-        props.add("exchangePattern");
-        props.add("eagerCheckCompletion");
-        props.add("completionSize");
-        props.add("timeoutCheckerExecutorService");
-        props.add("completionTimeout");
-        props.add("bridgeErrorHandler");
-        props.add("jmsKeyFormatStrategy");
-        props.add("keepAliveDelay");
-        props.add("completionInterval");
-        props.add("headerFilterStrategy");
-        props.add("destinationName");
-        props.add("messageCreatedStrategy");
-        props.add("asyncStartListener");
-        props.add("completionPredicate");
-        props.add("exceptionHandler");
-        props.add("allowNullBody");
-        PROPERTY_NAMES = Collections.unmodifiableSet(props);
-        SECRET_PROPERTY_NAMES = Collections.emptySet();
-    }
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "sjms-batch".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(properties);
-
-        uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(uri, copy, encode);
-        return uri;
-    }
-
-    @Override
-    public Set<String> propertyNames() {
-        return PROPERTY_NAMES;
-    }
-
-    @Override
-    public Set<String> secretPropertyNames() {
-        return SECRET_PROPERTY_NAMES;
-    }
-
-    @Override
-    public boolean isLenientProperties() {
-        return false;
-    }
-}
-
diff --git a/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index fd87f80..9531902 100644
--- a/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -1,5 +1,5 @@
 # Generated by camel build tools - do NOT edit this file!
-components=sjms sjms-batch
+components=sjms
 groupId=org.apache.camel
 artifactId=camel-sjms
 version=3.8.0-SNAPSHOT
diff --git a/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/component/sjms-batch b/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/component/sjms-batch
deleted file mode 100644
index 71c3752..0000000
--- a/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/component/sjms-batch
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.sjms.batch.SjmsBatchComponent
diff --git a/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/configurer/sjms-batch-component b/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/configurer/sjms-batch-component
deleted file mode 100644
index 2d4e192..0000000
--- a/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/configurer/sjms-batch-component
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.sjms.batch.SjmsBatchComponentConfigurer
diff --git a/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/configurer/sjms-batch-endpoint b/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/configurer/sjms-batch-endpoint
deleted file mode 100644
index 627a10d..0000000
--- a/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/configurer/sjms-batch-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.sjms.batch.SjmsBatchEndpointConfigurer
diff --git a/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/sjms-batch-endpoint b/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/sjms-batch-endpoint
deleted file mode 100644
index 67cb6a4..0000000
--- a/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/sjms-batch-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.sjms.batch.SjmsBatchEndpointUriFactory
diff --git a/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/batch/sjms-batch.json b/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/batch/sjms-batch.json
deleted file mode 100644
index 3930a7e..0000000
--- a/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/batch/sjms-batch.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "sjms-batch",
-    "title": "Simple JMS Batch",
-    "description": "Highly performant and transactional batch consumption of messages from a JMS queue.",
-    "deprecated": false,
-    "firstVersion": "2.16.0",
-    "label": "messaging",
-    "javaType": "org.apache.camel.component.sjms.batch.SjmsBatchComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-sjms",
-    "version": "3.8.0-SNAPSHOT",
-    "scheme": "sjms-batch",
-    "extendsScheme": "",
-    "syntax": "sjms-batch:destinationName",
-    "async": false,
-    "api": false,
-    "consumerOnly": true,
-    "producerOnly": false,
-    "lenientProperties": false
-  },
-  "componentProperties": {
-    "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
-    "asyncStartListener": { "kind": "property", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/or [...]
-    "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
-    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "A ConnectionFactory is required to enable the SjmsBatchComponent." },
-    "recoveryInterval": { "kind": "property", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 5000, "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
-    "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." }
-  },
-  "properties": {
-    "destinationName": { "kind": "path", "displayName": "Destination Name", "group": "consumer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The destination name. Only queues are supported, names may be prefixed by 'queue:'." },
-    "aggregationStrategy": { "kind": "parameter", "displayName": "Aggregation Strategy", "group": "consumer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.AggregationStrategy", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The aggregation strategy to use, which merges all the batched messages into a single message" },
-    "allowNullBody": { "kind": "parameter", "displayName": "Allow Null Body", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an JMSException is thrown." },
-    "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
-    "completionInterval": { "kind": "parameter", "displayName": "Completion Interval", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1000, "description": "The completion interval in millis, which causes batches to be completed in a scheduled fixed rate every interval. The batch may be empty if the timeout triggered and there was no messages in the batch. Notice you canno [...]
-    "completionPredicate": { "kind": "parameter", "displayName": "Completion Predicate", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The completion predicate, which causes batches to be completed when the predicate evaluates as true. The predicate can also be configured using the simple language using the string syntax. You may want to set the option eagerC [...]
-    "completionSize": { "kind": "parameter", "displayName": "Completion Size", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 200, "description": "The number of messages consumed at which the batch will be completed" },
-    "completionTimeout": { "kind": "parameter", "displayName": "Completion Timeout", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 500, "description": "The timeout in millis from receipt of the first first message when the batch will be completed. The batch may be empty if the timeout triggered and there was no messages in the batch. Notice you cannot use both completion [...]
-    "consumerCount": { "kind": "parameter", "displayName": "Consumer Count", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "The number of JMS sessions to consume from" },
-    "eagerCheckCompletion": { "kind": "parameter", "displayName": "Eager Check Completion", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Use eager completion checking which means that the completionPredicate will use the incoming Exchange. As opposed to without eager completion checking the completionPredicate will use the aggregated Exchange." },
-    "includeAllJMSXProperties": { "kind": "parameter", "displayName": "Include All JMSXProperties", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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 he [...]
-    "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc. See section about how mapping works below for more details." },
-    "pollDuration": { "kind": "parameter", "displayName": "Poll Duration", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1000, "description": "The duration in milliseconds of each poll for messages. completionTimeOut will be used if it is shorter and a batch has started." },
-    "sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If using completion timeout or interval, then the batch may be empty if the timeout triggered and there was no messages in the batch. If this option is true and the batch is empty then an empty mess [...]
-    "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
-    "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
-    "asyncStartListener": { "kind": "parameter", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/o [...]
-    "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
-    "jmsKeyFormatStrategy": { "kind": "parameter", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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 pass [...]
-    "keepAliveDelay": { "kind": "parameter", "displayName": "Keep Alive Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 5000, "description": "The delay in millis between attempts to re-establish a valid session. If this is a positive value the SjmsBatchConsumer will attempt to create a new session if it sees an Exception during message consumption. This del [...]
-    "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
-    "recoveryInterval": { "kind": "parameter", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 5000, "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
-    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
-    "timeoutCheckerExecutorService": { "kind": "parameter", "displayName": "Timeout Checker Executor Service", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.concurrent.ScheduledExecutorService", "deprecated": false, "autowired": false, "secret": false, "description": "If using the completionInterval option a background thread is created to trigger the completion interval. Set this option to provide a custom thread pool to be used ra [...]
-  }
-}
diff --git a/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json b/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json
index f504c36..47a2980 100644
--- a/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json
+++ b/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json
@@ -36,7 +36,6 @@
     "destinationCreationStrategy": { "kind": "property", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
     "jmsKeyFormatStrategy": { "kind": "property", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The defau [...]
     "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
-    "timedTaskManager": { "kind": "property", "displayName": "Timed Task Manager", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.taskmanager.TimedTaskManager", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom TimedTaskManager" },
     "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "connectionPassword": { "kind": "property", "displayName": "Connection Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
     "connectionUsername": { "kind": "property", "displayName": "Connection Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
@@ -46,26 +45,31 @@
     "destinationType": { "kind": "path", "displayName": "Destination Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "queue", "topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "queue", "description": "The kind of destination to use" },
     "destinationName": { "kind": "path", "displayName": "Destination Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "DestinationName is a JMS queue or topic name. By default, the destinationName is interpreted as a queue name." },
     "acknowledgementMode": { "kind": "parameter", "displayName": "Acknowledgement Mode", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.SessionAcknowledgementType", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "description": "The JMS acknowledgement name, which is one of:  [...]
+    "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from  [...]
+    "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
     "consumerCount": { "kind": "parameter", "displayName": "Consumer Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Sets the number of consumer listeners used for this endpoint." },
     "durableSubscriptionId": { "kind": "parameter", "displayName": "Durable Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the durable subscription Id required for durable topics." },
     "reconnectBackOff": { "kind": "parameter", "displayName": "Reconnect Back Off", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Backoff in millis on consumer pool reconnection attempts" },
     "reconnectOnError": { "kind": "parameter", "displayName": "Reconnect On Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Try to apply reconnection logic on consumer pool" },
+    "replyToDeliveryPersistent": { "kind": "parameter", "displayName": "Reply To Delivery Persistent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to use persistent delivery by default for replies." },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported)." },
     "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
     "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
     "messageSelector": { "kind": "parameter", "displayName": "Message Selector", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the JMS Message selector syntax." },
+    "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2." },
+    "deliveryPersistent": { "kind": "parameter", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether persistent delivery is used by default." },
+    "explicitQosEnabled": { "kind": "parameter", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "description": "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 timeToLi [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
-    "namedReplyTo": { "kind": "parameter", "displayName": "Named Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the reply to destination name used for InOut producer endpoints. The type of the reply to destination can be determined by the starting prefix (topic: or queue:) in its name." },
-    "persistent": { "kind": "parameter", "displayName": "Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Flag used to enable\/disable message persistence." },
-    "producerCount": { "kind": "parameter", "displayName": "Producer Count", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Sets the number of producers used for this endpoint." },
-    "ttl": { "kind": "parameter", "displayName": "Ttl", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "-1", "description": "Flag used to adjust the Time To Live value of produced messages." },
+    "preserveMessageQos": { "kind": "parameter", "displayName": "Preserve Message Qos", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDelive [...]
+    "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "description": "Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in orde [...]
+    "replyToOverride": { "kind": "parameter", "displayName": "Reply To Override", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination." },
+    "requestTimeout": { "kind": "parameter", "displayName": "Request Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "20000", "description": "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 timeou [...]
+    "timeToLive": { "kind": "parameter", "displayName": "Time To Live", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "description": "When sending messages, specifies the time-to-live of the message (in milliseconds)." },
     "allowNullBody": { "kind": "parameter", "displayName": "Allow Null Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an JMSException is thrown." },
-    "prefillPool": { "kind": "parameter", "displayName": "Prefill Pool", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to prefill the producer connection pool on startup, or create connections lazy when needed." },
-    "responseTimeOut": { "kind": "parameter", "displayName": "Response Time Out", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5s", "description": "Sets the amount of time we should wait before timing out a InOut response." },
     "asyncStartListener": { "kind": "parameter", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/o [...]
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to stop the consumer message listener asynchronously, when stopping a route." },
-    "connectionCount": { "kind": "parameter", "displayName": "Connection Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "The maximum number of connections available to this endpoint" },
+    "connectionCount": { "kind": "parameter", "displayName": "Connection Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "description": "The maximum number of connections available to this endpoint" },
     "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any" },
     "connectionResource": { "kind": "parameter", "displayName": "Connection Resource", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.ConnectionResource", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any" },
     "destinationCreationStrategy": { "kind": "parameter", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
@@ -78,8 +82,6 @@
     "errorHandlerLoggingLevel": { "kind": "parameter", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "description": "Allows to configure the default errorHandler logging level for logging uncaught exceptions." },
     "errorHandlerLogStackTrace": { "kind": "parameter", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Allows to control whether stacktraces should be logged or not, by the default errorHandler." },
     "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to use transacted mode" },
-    "transactionBatchCount": { "kind": "parameter", "displayName": "Transaction Batch Count", "group": "transaction", "label": "consumer,transaction", "required": false, "type": "integer", "javaType": "int", "deprecated": true, "autowired": false, "secret": false, "defaultValue": -1, "description": "If transacted sets the number of messages to process before committing a transaction." },
-    "transactionBatchTimeout": { "kind": "parameter", "displayName": "Transaction Batch Timeout", "group": "transaction", "label": "consumer,transaction", "required": false, "type": "duration", "javaType": "long", "deprecated": true, "autowired": false, "secret": false, "defaultValue": "5s", "description": "Sets timeout (in millis) for batch transactions, the value should be 1000 or higher." },
     "transactionCommitStrategy": { "kind": "parameter", "displayName": "Transaction Commit Strategy", "group": "transaction", "label": "transaction", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.TransactionCommitStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the commit strategy." },
     "sharedJMSSession": { "kind": "parameter", "displayName": "Shared JMSSession", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS provi [...]
   }
diff --git a/components/camel-sjms/src/main/docs/sjms-batch-component.adoc b/components/camel-sjms/src/main/docs/sjms-batch-component.adoc
deleted file mode 100644
index 28037ad..0000000
--- a/components/camel-sjms/src/main/docs/sjms-batch-component.adoc
+++ /dev/null
@@ -1,207 +0,0 @@
-[[sjms-batch-component]]
-= Simple JMS Batch Component
-:docTitle: Simple JMS Batch
-:artifactId: camel-sjms
-:description: Highly performant and transactional batch consumption of messages from a JMS queue.
-:since: 2.16
-:supportLevel: Stable
-:component-header: Only consumer is supported
-include::{cq-version}@camel-quarkus:ROOT:partial$reference/components/sjms-batch.adoc[opts=optional]
-
-*Since Camel {since}*
-
-*{component-header}*
-
-SJMS Batch is a specialized component for highly performant,
-transactional batch consumption from a JMS queue. It can be thought of
-as a hybrid of a consumer-only component and an
-aggregator.
-
-A common use case in Camel is to consume messages from a queue and
-aggregate them before sending the aggregated state to another endpoint.
-In order to ensure that data is not lost if the system performing the
-processing fails, it is typically consumed within a transaction from the
-queue, and once aggregated stored in a persistent
-`AggregationRepository`, such as the one found in the
-xref:jdbc-component.adoc[JDBC Component].
-
-The behavior of the aggregator pattern involves fetching data from the
-`AggregationRepository` before an incoming message is aggregated, and
-writing back the result afterwards. By nature, the reads and writes take
-progressively longer as the number of aggregated artifacts increases. A
-rough example of this using arbitrary time units that demonstrates the
-impact of this is as follows:
-
-[cols=",,,",options="header",]
-|=======================================
-|Item |Read Time |Write Time |Total Time
-|0 |0 |1 |1
-|1 |1 |2 |4
-|2 |2 |3 |9
-|3 |3 |4 |16
-|4 |4 |5 |25
-|5 |5 |6 |36
-|6 |6 |7 |49
-|7 |7 |8 |64
-|8 |8 |9 |81
-|9 |9 |10 |100
-|=======================================
-
-In contrast, consumption performance using the SJMS Batch component is
-linear. Each message is consumed and aggregated using an
-`AggregationStrategy` before the next one is fetched. As all of the
-consumption and aggregation is performed in a single JMS transaction no
-external storage is required to persist the intermediate state - this
-avoids the read and write costs described above. In practice, this
-yields multiple orders of magnitude higher throughput.
-
-Once a completion condition is met, either by size or period since first
-message, the aggregated `Exchange` is passed into the route. During the
-processing of this `Exchange`, if an exception is thrown or the system
-shuts down, all of the original consumed messages end up back on the
-queue (or are placed on the dead-letter queue depending on the broker
-configuration).
-
-Unlike using a regular aggregator, there is no facility for an
-aggregation condition, meaning that it is not possible to batch consume
-into multiple groups of messages. All consumed messages are aggregated
-together into a single batch.
-
-Multiple JMS consumer support is available which allows you to consume
-in parallel using the one route, and at the same time use facilities
-like JMS message groups to group related messages.
-
-Maven users will need to add the following dependency to their `pom.xml`
-for this component:
-
-[source,xml]
-----
-<dependency>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>camel-sjms</artifactId>
-    <version>x.x.x</version>
-    <!-- use the same version as your Camel core version -->
-</dependency>
-----
-
-== URI format
-
-[source]
-----
-sjms:[queue:]destinationName[?options]
-----
-
-Where `destinationName` is a JMS queue. By default, the
-`destinationName` is interpreted as a queue name.
-
-[source]
-----
-sjms:FOO.BAR
-----
-
-You can include the optional `queue:` prefix, if you prefer:
-
-[source]
-----
-sjms:queue:FOO.BAR
-----
-
-Topic consumption is not supported, as there is no advantage to using
-batch consumption within that context. Topic messages are usually
-non-persistent, and loss is acceptable. If consumed within a transaction
-that fails, a topic message will likely not be redelivered by the
-broker. A plain xref:sjms-component.adoc[SJMS] consumer endpoint can be used in
-conjunction with a regular non-persistence backed
-aggregator in this scenario.
-
-== Component Options and Configurations
-
-
-
-
-// component options: START
-The Simple JMS Batch component supports 6 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
-| *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
-| *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
-| *connectionFactory* (advanced) | A ConnectionFactory is required to enable the SjmsBatchComponent. |  | ConnectionFactory
-| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | int
-| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
-|===
-// component options: END
-
-
-
-
-
-
-
-
-
-// endpoint options: START
-The Simple JMS Batch endpoint is configured using URI syntax:
-
-----
-sjms-batch:destinationName
-----
-
-with the following path and query parameters:
-
-=== Path Parameters (1 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *destinationName* | *Required* The destination name. Only queues are supported, names may be prefixed by 'queue:'. |  | String
-|===
-
-
-=== Query Parameters (23 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *aggregationStrategy* (consumer) | *Required* The aggregation strategy to use, which merges all the batched messages into a single message |  | AggregationStrategy
-| *allowNullBody* (consumer) | 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
-| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
-| *completionInterval* (consumer) | The completion interval in millis, which causes batches to be completed in a scheduled fixed rate every interval. The batch may be empty if the timeout triggered and there was no messages in the batch. Notice you cannot use both completion timeout and completion interval at the same time, only one can be configured. | 1000 | int
-| *completionPredicate* (consumer) | The completion predicate, which causes batches to be completed when the predicate evaluates as true. The predicate can also be configured using the simple language using the string syntax. You may want to set the option eagerCheckCompletion to true to let the predicate match the incoming message, as otherwise it matches the aggregated message. |  | String
-| *completionSize* (consumer) | The number of messages consumed at which the batch will be completed | 200 | int
-| *completionTimeout* (consumer) | The timeout in millis from receipt of the first first message when the batch will be completed. The batch may be empty if the timeout triggered and there was no messages in the batch. Notice you cannot use both completion timeout and completion interval at the same time, only one can be configured. | 500 | int
-| *consumerCount* (consumer) | The number of JMS sessions to consume from | 1 | int
-| *eagerCheckCompletion* (consumer) | Use eager completion checking which means that the completionPredicate will use the incoming Exchange. As opposed to without eager completion checking the completionPredicate will use the aggregated Exchange. | false | boolean
-| *includeAllJMSXProperties* (consumer) | 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
-| *mapJmsMessage* (consumer) | Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc. See section about how mapping works below for more details. | true | boolean
-| *pollDuration* (consumer) | The duration in milliseconds of each poll for messages. completionTimeOut will be used if it is shorter and a batch has started. | 1000 | int
-| *sendEmptyMessageWhenIdle* (consumer) | If using completion timeout or interval, then the batch may be empty if the timeout triggered and there was no messages in the batch. If this option is true and the batch is empty then an empty message is added to the batch so an empty message is routed. | false | boolean
-| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
-| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
-| *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
-| *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
-| *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 [...]
-| *keepAliveDelay* (advanced) | The delay in millis between attempts to re-establish a valid session. If this is a positive value the SjmsBatchConsumer will attempt to create a new session if it sees an Exception during message consumption. This delay value allows you to pause between attempts to prevent spamming the logs. If this is a negative value then the SjmsBatchConsumer will bail out and the consumer will not stop consuming new messages. The default is 5000 ms, that is, 5 seconds. [...]
-| *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
-| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | int
-| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *timeoutCheckerExecutorService* (advanced) | If using the completionInterval option a background thread is created to trigger the completion interval. Set this option to provide a custom thread pool to be used rather than creating a new thread for every consumer. |  | ScheduledExecutorService
-|===
-// endpoint options: END
-
-
-
-
-
-
-The `completionSize` endpoint attribute is used in conjunction with
-`completionTimeout`, where the first condition to be met will cause the
-aggregated `Exchange` to be emitted down the route.
-
-include::camel-spring-boot::page$sjms-starter.adoc[]
diff --git a/components/camel-sjms/src/main/docs/sjms-component.adoc b/components/camel-sjms/src/main/docs/sjms-component.adoc
index 931c813..20de46e 100644
--- a/components/camel-sjms/src/main/docs/sjms-component.adoc
+++ b/components/camel-sjms/src/main/docs/sjms-component.adoc
@@ -18,6 +18,8 @@ and configuration. SJMS contains a brand new JMS client API written
 explicitly for Camel eliminating third party messaging implementations
 keeping it light and resilient. The following features is included:
 
+// TODO: Update this after refactor
+
 * Standard Queue and Topic Support (Durable & Non-Durable)
 * InOnly & InOut MEP Support
 * Asynchronous Producer and Consumer Processing
@@ -27,8 +29,6 @@ Additional key features include:
 
 * Plugable Connection Resource Management
 * Session, Consumer, & Producer Pooling & Caching Management
-* Batch Consumers
-* Transacted Batch Consumers (*deprecated*)
 * Support for Customizable Transaction Commit Strategies (Local JMS
 Transactions only)
 
@@ -90,7 +90,7 @@ You append query options to the URI using the following format,
 == Component Options and Configurations
 
 // component options: START
-The Simple JMS component supports 19 options, which are listed below.
+The Simple JMS component supports 18 options, which are listed below.
 
 
 
@@ -111,7 +111,6 @@ The Simple JMS component supports 19 options, which are listed below.
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *jmsKeyFormatStrategy* (advanced) | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The default strategy will safely marshal dots and hyphens (. and -). 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  [...]
 | *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
-| *timedTaskManager* (advanced) | To use a custom TimedTaskManager |  | TimedTaskManager
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *connectionPassword* (security) | The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
 | *connectionUsername* (security) | The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
@@ -140,33 +139,38 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (37 parameters):
+=== Query Parameters (40 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *acknowledgementMode* (common) | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. There are 4 enums and the value can be one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | SessionAcknowledgementType
+| *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message broker [...]
+| *replyTo* (common) | Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer). |  | String
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *consumerCount* (consumer) | Sets the number of consumer listeners used for this endpoint. | 1 | int
 | *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
 | *reconnectBackOff* (consumer) | Backoff in millis on consumer pool reconnection attempts | 5000 | long
 | *reconnectOnError* (consumer) | Try to apply reconnection logic on consumer pool | true | boolean
+| *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
 | *synchronous* (consumer) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | true | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
 | *messageSelector* (consumer) | Sets the JMS Message selector syntax. |  | String
+| *deliveryMode* (producer) | Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2. There are 2 enums and the value can be one of: 1, 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
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *namedReplyTo* (producer) | Sets the reply to destination name used for InOut producer endpoints. The type of the reply to destination can be determined by the starting prefix (topic: or queue:) in its name. |  | String
-| *persistent* (producer) | Flag used to enable/disable message persistence. | true | boolean
-| *producerCount* (producer) | Sets the number of producers used for this endpoint. | 1 | int
-| *ttl* (producer) | Flag used to adjust the Time To Live value of produced messages. | -1 | long
+| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
+| *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
+| *replyToOverride* (producer) | Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination. |  | String
+| *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
 | *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
-| *prefillPool* (producer) | Whether to prefill the producer connection pool on startup, or create connections lazy when needed. | true | boolean
-| *responseTimeOut* (producer) | Sets the amount of time we should wait before timing out a InOut response. | 5s | long
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
-| *connectionCount* (advanced) | The maximum number of connections available to this endpoint |  | Integer
+| *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
 | *connectionFactory* (advanced) | Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any |  | ConnectionFactory
 | *connectionResource* (advanced) | Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any |  | ConnectionResource
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
@@ -179,8 +183,6 @@ with the following path and query parameters:
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
-| *transactionBatchCount* (transaction) | *Deprecated* If transacted sets the number of messages to process before committing a transaction. | -1 | int
-| *transactionBatchTimeout* (transaction) | *Deprecated* Sets timeout (in millis) for batch transactions, the value should be 1000 or higher. | 5s | long
 | *transactionCommitStrategy* (transaction) | Sets the commit strategy. |  | TransactionCommitStrategy
 | *sharedJMSSession* (transaction) | Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS providers, use jms component to leverage XA transaction. | true | boolean
 |===
@@ -240,13 +242,13 @@ from("direct:start")
     .to("sjms:queue:bar?exchangePattern=InOut");
 ----
 
-You can specify a `namedReplyTo` though which can provide a better
+You can specify a `replyTo` though which can provide a better
 monitor point.
 
 [source,java]
 ----
 from("direct:start")
-    .to("sjms:queue:bar?exchangePattern=InOut&namedReplyTo=my.reply.to.queue");
+    .to("sjms:queue:bar?replyTo=my.reply.to.queue");
 ----
 
 == Consumer Usage
@@ -423,57 +425,6 @@ transaction strategy through the use of the `TransactionCommitStrategy`
 interface. This allows a user to define a unique set of circumstances
 that the `SessionTransactionSynchronization`
 will use to determine when to commit the Session.
-An example of its use is the `BatchTransactionCommitStrategy`
-which is detailed further in the next section.
-
-=== Transacted Batch Consumers
-
-WARNING: This feature is deprecated because under some situations with race conditions then
-transactions that are committed via a timeout may not work correctly.
-
-The SJMS component has been designed to support the batching of local JMS
-transactions on the consumer endpoints. How they are
-handled on each is very different though.
-
-The SJMS consumer endpoint is a straightforward implementation that will
-process X messages before committing them with the associated Session.
-To enable batched transaction on the consumer first enable transactions
-by setting the `transacted` parameter to true and then adding the
-`transactionBatchCount` and setting it to any value that is greater than
-0. For example the following configuration will commit the Session every
-10 messages:
-
-[source,text]
-----
-sjms:queue:transacted.batch.consumer?transacted=true&transactionBatchCount=10
-----
-
-If an exception occurs during the processing of a batch on the consumer
-endpoint, the Session rollback is invoked causing the messages to be
-redelivered to the next available consumer. The counter is also reset to
-0 for the `BatchTransactionCommitStrategy` for the associated Session as
-well. It is the responsibility of the user to ensure they put hooks in
-their processors of batch messages to watch for messages with the
-JMSRedelivered header set to true. This is the indicator that messages
-were rolled back at some point and that a verification of a successful
-processing should occur.
-
-A transacted batch consumer also carries with it an instance of an
-internal timer that waits a default amount of time (5000ms) between
-messages before committing the open transactions on the Session. The
-default value of 5000ms (minimum of 1000ms) should be adequate for most
-use-cases but if further tuning is necessary simply set the
-`transactionBatchTimeout` parameter.
-
-[source,text]
-----
-sjms:queue:transacted.batch.consumer?transacted=true&transactionBatchCount=10&transactionBatchTimeout=2000
-----
-
-The minimal value that will be accepted is 1000ms as the amount of
-context switching may cause unnecessary performance impacts without
-gaining benefit.
-
 
 == Additional Notes
 
@@ -542,9 +493,9 @@ Not at all. Below is an example of the SJMS component using the Spring XML:
 
 [source,xml]
 ----
-<route id="inout.named.reply.to.producer.route">
+<route>
     <from uri="direct:invoke.named.reply.to.queue" />
-    <to uri="sjms:queue:named.reply.to.queue?namedReplyTo=my.response.queue&amp;exchangePattern=InOut" />
+    <to uri="sjms:queue:named.reply.to.queue?namedReplyTo=my.response.queue" />
 </route>
 ----
 
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java
index fb6b50f..6ed1e19 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java
@@ -20,6 +20,7 @@ import javax.jms.Destination;
 import javax.jms.MessageConsumer;
 import javax.jms.Session;
 
+@Deprecated
 public class MessageConsumerResources {
 
     private final Session session;
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageProducerPool.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageProducerPool.java
deleted file mode 100644
index 682b21d..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageProducerPool.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms;
-
-import javax.jms.JMSException;
-
-import org.apache.commons.pool.BasePoolableObjectFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The {@link MessageProducerResources} pool for {@link SjmsProducer} producers.
- */
-class MessageProducerPool extends BasePoolableObjectFactory<MessageProducerResources> {
-
-    private static final Logger LOG = LoggerFactory.getLogger(MessageProducerPool.class);
-
-    private final SjmsProducer sjmsProducer;
-
-    public MessageProducerPool(SjmsProducer sjmsProducer) {
-        this.sjmsProducer = sjmsProducer;
-    }
-
-    @Override
-    public MessageProducerResources makeObject() throws Exception {
-        return sjmsProducer.doCreateProducerModel(sjmsProducer.createSession());
-    }
-
-    @Override
-    public boolean validateObject(MessageProducerResources obj) {
-        try {
-            obj.getSession().getAcknowledgeMode();
-            return true;
-        } catch (JMSException ex) {
-            LOG.warn("Cannot validate JMS session", ex);
-        }
-        return false;
-    }
-
-    @Override
-    public void destroyObject(MessageProducerResources model) throws Exception {
-        if (model.getMessageProducer() != null) {
-            model.getMessageProducer().close();
-        }
-
-        if (model.getSession() != null) {
-            try {
-                if (model.getSession().getTransacted()) {
-                    try {
-                        model.getSession().rollback();
-                    } catch (Exception e) {
-                        // Do nothing. Just make sure we are cleaned up
-                    }
-                }
-                model.getSession().close();
-            } catch (Exception e) {
-                // ignore
-            }
-        }
-    }
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageProducerResources.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageProducerResources.java
deleted file mode 100644
index 34a398d..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageProducerResources.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms;
-
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-
-/**
- * The {@link MessageProducer} resources for all {@link SjmsProducer} classes.
- */
-public class MessageProducerResources {
-
-    private final Session session;
-    private final MessageProducer messageProducer;
-    private final TransactionCommitStrategy commitStrategy;
-
-    public MessageProducerResources(Session session, MessageProducer messageProducer) {
-        this(session, messageProducer, null);
-    }
-
-    public MessageProducerResources(Session session, MessageProducer messageProducer,
-                                    TransactionCommitStrategy commitStrategy) {
-        this.session = session;
-        this.messageProducer = messageProducer;
-        this.commitStrategy = commitStrategy;
-    }
-
-    /**
-     * Gets the Session value of session for this instance of MessageProducerResources.
-     *
-     * @return the session
-     */
-    public Session getSession() {
-        return session;
-    }
-
-    /**
-     * Gets the QueueSender value of queueSender for this instance of MessageProducerResources.
-     *
-     * @return the queueSender
-     */
-    public MessageProducer getMessageProducer() {
-        return messageProducer;
-    }
-
-    /**
-     * Gets the TransactionCommitStrategy value of commitStrategy for this instance of
-     * SjmsProducer.MessageProducerResources.
-     *
-     * @return the commitStrategy
-     */
-    public TransactionCommitStrategy getCommitStrategy() {
-        return commitStrategy;
-    }
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/ListAggregationStrategy.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SessionCallback.java
similarity index 51%
rename from components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/ListAggregationStrategy.java
rename to components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SessionCallback.java
index 8a8b8ad..8d9e23d 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/ListAggregationStrategy.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SessionCallback.java
@@ -14,28 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.sjms.batch;
+package org.apache.camel.component.sjms;
 
-import java.util.ArrayList;
-import java.util.List;
+import javax.jms.Session;
 
-import org.apache.camel.AggregationStrategy;
-import org.apache.camel.Exchange;
+@FunctionalInterface
+public interface SessionCallback<T> {
 
-public class ListAggregationStrategy implements AggregationStrategy {
-
-    @Override
-    public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
-        String body = newExchange.getIn().getBody(String.class);
-        if (oldExchange == null) {
-            List<String> list = new ArrayList<>();
-            list.add(body);
-            newExchange.getIn().setBody(list);
-            return newExchange;
-        } else {
-            List<String> list = oldExchange.getIn().getBody(List.class);
-            list.add(body);
-            return oldExchange;
-        }
-    }
+    T doInJms(Session session) throws Exception;
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
index 4d32269..1b4fe9a 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
@@ -29,7 +29,6 @@ import org.apache.camel.component.sjms.jms.DefaultJmsKeyFormatStrategy;
 import org.apache.camel.component.sjms.jms.DestinationCreationStrategy;
 import org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy;
 import org.apache.camel.component.sjms.jms.MessageCreatedStrategy;
-import org.apache.camel.component.sjms.taskmanager.TimedTaskManager;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
 import org.apache.camel.support.HeaderFilterStrategyComponent;
@@ -61,8 +60,6 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
     @Metadata(label = "transaction",
               description = "To configure which kind of commit strategy to use. Camel provides two implementations out of the box, default and batch.")
     private TransactionCommitStrategy transactionCommitStrategy;
-    @Metadata(label = "advanced", description = "To use a custom TimedTaskManager")
-    private TimedTaskManager timedTaskManager;
     @Metadata(label = "advanced", description = "To use a custom DestinationCreationStrategy.")
     private DestinationCreationStrategy destinationCreationStrategy;
     @Metadata(label = "advanced",
@@ -130,42 +127,27 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
     }
 
     /**
-     * Helper method used to verify that when there is a namedReplyTo value we are using the InOut MEP. If namedReplyTo
-     * is defined and the MEP is InOnly the endpoint won't be expecting a reply so throw an error to alert the user.
+     * Helper method used to verify that when there is a replyTo value we are using the InOut MEP. If namedReplyTo is
+     * defined and the MEP is InOnly the endpoint won't be expecting a reply so throw an error to alert the user.
      *
      * @param  parameters {@link Endpoint} parameters
-     * @throws Exception  throws a {@link CamelException} when MEP equals InOnly and namedReplyTo is defined.
+     * @throws Exception  throws a {@link CamelException} when MEP equals InOnly and replyTo is defined.
      */
     private static void validateMepAndReplyTo(Map<String, Object> parameters) throws Exception {
-        boolean namedReplyToSet = parameters.containsKey("namedReplyTo");
+        boolean replyToSet = parameters.containsKey("replyTo");
         boolean mepSet = parameters.containsKey("exchangePattern");
-        if (namedReplyToSet && mepSet) {
+        if (replyToSet && mepSet) {
             if (!parameters.get("exchangePattern").equals(ExchangePattern.InOut.toString())) {
-                String namedReplyTo = (String) parameters.get("namedReplyTo");
+                String replyTo = (String) parameters.get("replyTo");
                 ExchangePattern mep = ExchangePattern.valueOf((String) parameters.get("exchangePattern"));
                 throw new CamelException(
-                        "Setting parameter namedReplyTo=" + namedReplyTo
+                        "Setting parameter replyTo=" + replyTo
                                          + " requires a MEP of type InOut. Parameter exchangePattern is set to " + mep);
             }
         }
     }
 
     @Override
-    protected void doStart() throws Exception {
-        super.doStart();
-        timedTaskManager = new TimedTaskManager();
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        if (timedTaskManager != null) {
-            timedTaskManager.cancelTasks();
-            timedTaskManager = null;
-        }
-        super.doStop();
-    }
-
-    @Override
     protected void doShutdown() throws Exception {
         if (asyncStartStopExecutorService != null) {
             getCamelContext().getExecutorServiceManager().shutdownNow(asyncStartStopExecutorService);
@@ -257,17 +239,6 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
         this.destinationCreationStrategy = destinationCreationStrategy;
     }
 
-    public TimedTaskManager getTimedTaskManager() {
-        return timedTaskManager;
-    }
-
-    /**
-     * To use a custom TimedTaskManager
-     */
-    public void setTimedTaskManager(TimedTaskManager timedTaskManager) {
-        this.timedTaskManager = timedTaskManager;
-    }
-
     public MessageCreatedStrategy getMessageCreatedStrategy() {
         return messageCreatedStrategy;
     }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConstants.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConstants.java
index 9a40c1f..55d36a7 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConstants.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConstants.java
@@ -21,5 +21,7 @@ public interface SjmsConstants {
     String JMS_MESSAGE_TYPE = "CamelJmsMessageType";
     String JMS_SESSION = "CamelJMSSession";
     String JMS_DESTINATION_NAME = "CamelJMSDestinationName";
+    String JMS_REQUEST_TIMEOUT = "CamelJmsRequestTimeout";
+    String JMS_DELIVERY_MODE = "CamelJmsDeliveryMode";
 
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java
index 8c17fb8..f1ffcaf 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java
@@ -41,10 +41,7 @@ import org.apache.camel.component.sjms.consumer.AbstractMessageHandler;
 import org.apache.camel.component.sjms.consumer.InOnlyMessageHandler;
 import org.apache.camel.component.sjms.consumer.InOutMessageHandler;
 import org.apache.camel.component.sjms.jms.ConnectionResource;
-import org.apache.camel.component.sjms.taskmanager.TimedTaskManager;
-import org.apache.camel.component.sjms.tx.BatchTransactionCommitStrategy;
 import org.apache.camel.component.sjms.tx.DefaultTransactionCommitStrategy;
-import org.apache.camel.component.sjms.tx.SessionBatchTransactionSynchronization;
 import org.apache.camel.component.sjms.tx.SessionTransactionSynchronization;
 import org.apache.camel.spi.Synchronization;
 import org.apache.camel.support.DefaultConsumer;
@@ -225,24 +222,14 @@ public class SjmsConsumer extends DefaultConsumer {
      * @return         the listener
      */
     protected MessageListener createMessageHandler(Session session) {
-
         TransactionCommitStrategy commitStrategy;
         if (getTransactionCommitStrategy() != null) {
             commitStrategy = getTransactionCommitStrategy();
-        } else if (getTransactionBatchCount() > 0) {
-            commitStrategy = new BatchTransactionCommitStrategy(getTransactionBatchCount());
         } else {
             commitStrategy = new DefaultTransactionCommitStrategy();
         }
 
-        Synchronization synchronization;
-        if (commitStrategy instanceof BatchTransactionCommitStrategy) {
-            TimedTaskManager timedTaskManager = getEndpoint().getComponent().getTimedTaskManager();
-            synchronization = new SessionBatchTransactionSynchronization(
-                    timedTaskManager, session, commitStrategy, getTransactionBatchTimeout());
-        } else {
-            synchronization = new SessionTransactionSynchronization(session, commitStrategy);
-        }
+        Synchronization synchronization = new SessionTransactionSynchronization(null, session, commitStrategy, false);
 
         AbstractMessageHandler messageHandler;
         if (getEndpoint().getExchangePattern().equals(ExchangePattern.InOnly)) {
@@ -367,24 +354,6 @@ public class SjmsConsumer extends DefaultConsumer {
         return getEndpoint().getTransactionCommitStrategy();
     }
 
-    /**
-     * If transacted, returns the nubmer of messages to be processed before committing the transaction.
-     *
-     * @return the transactionBatchCount
-     */
-    public int getTransactionBatchCount() {
-        return getEndpoint().getTransactionBatchCount();
-    }
-
-    /**
-     * Returns the timeout value for batch transactions.
-     *
-     * @return long
-     */
-    public long getTransactionBatchTimeout() {
-        return getEndpoint().getTransactionBatchTimeout();
-    }
-
     private boolean refillPool(BackOffTimer.Task task) {
         LOG.debug("Refill consumers pool task running");
         try {
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
index b432547..84a8b03 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
@@ -54,7 +54,6 @@ import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
 import org.apache.camel.support.DefaultEndpoint;
 import org.apache.camel.support.EndpointHelper;
-import org.apache.camel.support.LanguageSupport;
 import org.apache.camel.support.LoggingExceptionHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68,10 +67,10 @@ import org.slf4j.LoggerFactory;
              category = { Category.MESSAGING })
 public class SjmsEndpoint extends DefaultEndpoint
         implements AsyncEndpoint, MultipleConsumersSupport, HeaderFilterStrategyAware {
-    protected final Logger logger = LoggerFactory.getLogger(getClass());
 
-    private boolean topic;
+    private static final Logger LOG = LoggerFactory.getLogger(SjmsEndpoint.class);
 
+    private boolean topic;
     private JmsBinding binding;
 
     @UriPath(enums = "queue,topic", defaultValue = "queue", description = "The kind of destination to use")
@@ -79,6 +78,7 @@ public class SjmsEndpoint extends DefaultEndpoint
     @UriPath(description = "DestinationName is a JMS queue or topic name. By default, the destinationName is interpreted as a queue name.")
     @Metadata(required = true)
     private String destinationName;
+    // TODO: get rid of synchronous true for consumer
     @UriParam(label = "consumer", defaultValue = "true",
               description = "Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).")
     private boolean synchronous = true;
@@ -96,48 +96,69 @@ public class SjmsEndpoint extends DefaultEndpoint
               description = "Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers."
                             + " If you need transaction against multiple JMS providers, use jms component to leverage XA transaction.")
     private boolean sharedJMSSession = true;
-    @UriParam(label = "producer",
-              description = "Sets the reply to destination name used for InOut producer endpoints. The type of the reply "
-                            + "to destination can be determined by the starting prefix (topic: or queue:) in its name.")
-    private String namedReplyTo;
+    @UriParam(label = "common",
+              description = "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer).")
+    private String replyTo;
     @UriParam(defaultValue = "AUTO_ACKNOWLEDGE",
               enums = "SESSION_TRANSACTED,CLIENT_ACKNOWLEDGE,AUTO_ACKNOWLEDGE,DUPS_OK_ACKNOWLEDGE",
               description = "The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE")
     private SessionAcknowledgementType acknowledgementMode = SessionAcknowledgementType.AUTO_ACKNOWLEDGE;
-    @Deprecated
-    private int sessionCount = 1;
-    @UriParam(label = "producer", defaultValue = "1",
-              description = "Sets the number of producers used for this endpoint.")
-    private int producerCount = 1;
     @UriParam(label = "consumer", defaultValue = "1",
               description = "Sets the number of consumer listeners used for this endpoint.")
     private int consumerCount = 1;
-    @UriParam(label = "producer", defaultValue = "-1",
-              description = "Flag used to adjust the Time To Live value of produced messages.",
-              javaType = "java.time.Duration")
-    private long ttl = -1;
-    @UriParam(label = "producer", defaultValue = "true",
-              description = "Flag used to enable/disable message persistence.")
-    private boolean persistent = true;
+    @UriParam(label = "producer", defaultValue = "false",
+              description = "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.")
+    private Boolean explicitQosEnabled;
+    @UriParam(label = "producer",
+              description = "Set to true, if you want to send message using the QoS settings specified on the message,"
+                            + " instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode,"
+                            + " and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the"
+                            + " values from the endpoint instead. So, when using this option, the headers override the values from the endpoint."
+                            + " The explicitQosEnabled option, by contrast, will only use options set on the endpoint, and not values from the message header.")
+    private boolean preserveMessageQos;
+    @UriParam(defaultValue = "" + Message.DEFAULT_PRIORITY, enums = "1,2,3,4,5,6,7,8,9", label = "producer",
+              description = "Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest)."
+                            + " The explicitQosEnabled option must also be enabled in order for this option to have any effect.")
+    private int priority = Message.DEFAULT_PRIORITY;
+    @UriParam(defaultValue = "true", label = "producer",
+              description = "Specifies whether persistent delivery is used by default.")
+    private boolean deliveryPersistent = true;
+    @UriParam(description = "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to"
+                            + " the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a"
+                            + " route and you do not want Camel to automatically send back a reply message because another component in your code"
+                            + " handles the reply message. You can also use this option if you want to use Camel as a proxy between different"
+                            + " message brokers and you want to route message from one system to another.")
+    private boolean disableReplyTo;
+    @UriParam(label = "producer",
+              description = "Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo."
+                            + " It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination.")
+    private String replyToOverride;
+    @UriParam(defaultValue = "true", label = "consumer",
+              description = "Specifies whether to use persistent delivery by default for replies.")
+    private boolean replyToDeliveryPersistent = true;
+    @UriParam(enums = "1,2", label = "producer",
+              description = "Specifies the delivery mode to be used."
+                            + " Possible values are those defined by javax.jms.DeliveryMode."
+                            + " NON_PERSISTENT = 1 and PERSISTENT = 2.")
+    private Integer deliveryMode;
+    @UriParam(defaultValue = "-1", label = "producer",
+              description = "When sending messages, specifies the time-to-live of the message (in milliseconds).")
+    private long timeToLive = -1;
     @UriParam(label = "consumer",
               description = "Sets the durable subscription Id required for durable topics.")
     private String durableSubscriptionId;
-    @UriParam(label = "producer,advanced", defaultValue = "5s",
-              description = "Sets the amount of time we should wait before timing out a InOut response.",
-              javaType = "java.time.Duration")
-    private long responseTimeOut = 5000;
+    @UriParam(defaultValue = "20000", label = "producer", javaType = "java.time.Duration",
+              description = "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.")
+    private long requestTimeout = 20000L;
     @UriParam(label = "consumer,advanced",
               description = "Sets the JMS Message selector syntax.")
     private String messageSelector;
-    @UriParam(label = "consumer,transaction", defaultValue = "-1",
-              description = "If transacted sets the number of messages to process before committing a transaction.")
-    @Deprecated
-    private int transactionBatchCount = -1;
-    @UriParam(label = "consumer,transaction", defaultValue = "5s",
-              description = "Sets timeout (in millis) for batch transactions, the value should be 1000 or higher.",
-              javaType = "java.time.Duration")
-    @Deprecated
-    private long transactionBatchTimeout = 5000;
     @UriParam(label = "advanced",
               description = "Whether to startup the consumer message listener asynchronously, when starting a route."
                             + " For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover."
@@ -149,9 +170,6 @@ public class SjmsEndpoint extends DefaultEndpoint
               description = "Whether to stop the consumer message listener asynchronously, when stopping a route.")
     private boolean asyncStopListener;
     @UriParam(label = "producer,advanced", defaultValue = "true",
-              description = "Whether to prefill the producer connection pool on startup, or create connections lazy when needed.")
-    private boolean prefillPool = true;
-    @UriParam(label = "producer,advanced", defaultValue = "true",
               description = "Whether to allow sending messages with no body. If this option is false and the message body is null, then an JMSException is thrown.")
     private boolean allowNullBody = true;
     @UriParam(label = "advanced", defaultValue = "true",
@@ -181,6 +199,7 @@ public class SjmsEndpoint extends DefaultEndpoint
     private ConnectionFactory connectionFactory;
     @UriParam(label = "advanced",
               description = "The maximum number of connections available to this endpoint")
+    @Deprecated
     private Integer connectionCount;
     @UriParam(label = "advanced",
               description = "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions.")
@@ -197,6 +216,7 @@ public class SjmsEndpoint extends DefaultEndpoint
               description = "Backoff in millis on consumer pool reconnection attempts", defaultValue = "5000")
     private long reconnectBackOff = 5000;
 
+    @Deprecated
     private volatile boolean closeConnectionResource;
 
     private JmsObjectFactory jmsObjectFactory = new Jms11ObjectFactory();
@@ -217,46 +237,13 @@ public class SjmsEndpoint extends DefaultEndpoint
     }
 
     @Override
-    protected void doStart() throws Exception {
-        super.doStart();
-
-        if (!isAsyncStartListener()) {
-            // if we are not async starting then create connection eager
-            if (getConnectionResource() == null) {
-                if (getConnectionFactory() != null) {
-                    connectionResource = createConnectionResource(this);
-                    // we created the resource so we should close it when stopping
-                    closeConnectionResource = true;
-                }
-            } else if (getConnectionResource() instanceof ConnectionFactoryResource) {
-                ((ConnectionFactoryResource) getConnectionResource()).fillPool();
-            }
-        }
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        if (closeConnectionResource) {
-            if (connectionResource instanceof ConnectionFactoryResource) {
-                ((ConnectionFactoryResource) getConnectionResource()).drainPool();
-            }
-            closeConnectionResource = false;
-            connectionResource = null;
-        }
-        super.doStop();
-    }
-
-    @Override
     public Producer createProducer() throws Exception {
         SjmsProducer producer;
-        if (getExchangePattern().equals(ExchangePattern.InOnly)) {
-            producer = new InOnlyProducer(this);
-        } else {
+        // TODO: Merge inOutProducer and InOnlyProducer into one class so this can be dynamic via exchange MEP
+        if (!isDisableReplyTo() && getExchangePattern().equals(ExchangePattern.InOut)) {
             producer = new InOutProducer(this);
-        }
-        // are we using dynamic destinations?
-        if (LanguageSupport.hasSimpleFunction(getDestinationName())) {
-            producer.disableProducers();
+        } else {
+            producer = new InOnlyProducer(this);
         }
         return producer;
     }
@@ -273,14 +260,15 @@ public class SjmsEndpoint extends DefaultEndpoint
         return true;
     }
 
-    protected ConnectionResource createConnectionResource(Object source) {
+    @Deprecated
+    public ConnectionResource createConnectionResource(Object source) {
         if (getConnectionFactory() == null) {
             throw new IllegalArgumentException(
                     String.format("ConnectionResource or ConnectionFactory must be configured for %s", this));
         }
 
         try {
-            logger.debug("Creating ConnectionResource with connectionCount: {} using ConnectionFactory: {}",
+            LOG.debug("Creating ConnectionResource with connectionCount: {} using ConnectionFactory: {}",
                     getConnectionCount(), getConnectionFactory());
             // We always use a connection pool, even for a pool of 1
             ConnectionFactoryResource connections = new ConnectionFactoryResource(
@@ -309,6 +297,25 @@ public class SjmsEndpoint extends DefaultEndpoint
         return exchange;
     }
 
+    /**
+     * When one of the QoS properties are configured such as {@link #setDeliveryPersistent(boolean)},
+     * {@link #setPriority(int)} or {@link #setTimeToLive(long)} then we should auto default the setting of
+     * {@link #setExplicitQosEnabled(Boolean)} if its not been configured yet
+     */
+    protected void configuredQoS() {
+        if (explicitQosEnabled == null) {
+            explicitQosEnabled = true;
+        }
+    }
+
+    public boolean isPreserveMessageQos() {
+        return preserveMessageQos;
+    }
+
+    public void setPreserveMessageQos(boolean preserveMessageQos) {
+        this.preserveMessageQos = preserveMessageQos;
+    }
+
     public JmsBinding getBinding() {
         if (binding == null) {
             binding = createBinding();
@@ -429,67 +436,87 @@ public class SjmsEndpoint extends DefaultEndpoint
         return topic;
     }
 
-    /**
-     * Returns the number of Session instances expected on this endpoint.
-     */
-    @Deprecated
-    public int getSessionCount() {
-        return sessionCount;
+    public int getConsumerCount() {
+        return consumerCount;
     }
 
     /**
-     * Sets the number of Session instances used for this endpoint. Value is ignored for endpoints that require a
-     * dedicated session such as a transacted or InOut endpoint.
-     *
-     * @param sessionCount the number of Session instances, default is 1
+     * Sets the number of consumer listeners used for this endpoint.
      */
-    @Deprecated
-    public void setSessionCount(int sessionCount) {
-        this.sessionCount = sessionCount;
+    public void setConsumerCount(int consumerCount) {
+        this.consumerCount = consumerCount;
     }
 
-    public int getProducerCount() {
-        return producerCount;
+    public Boolean getExplicitQosEnabled() {
+        return explicitQosEnabled;
     }
 
-    /**
-     * Sets the number of producers used for this endpoint.
-     */
-    public void setProducerCount(int producerCount) {
-        this.producerCount = producerCount;
+    public void setExplicitQosEnabled(Boolean explicitQosEnabled) {
+        this.explicitQosEnabled = explicitQosEnabled;
     }
 
-    public int getConsumerCount() {
-        return consumerCount;
+    public boolean isExplicitQosEnabled() {
+        return explicitQosEnabled != null ? explicitQosEnabled : false;
     }
 
-    /**
-     * Sets the number of consumer listeners used for this endpoint.
-     */
-    public void setConsumerCount(int consumerCount) {
-        this.consumerCount = consumerCount;
+    public int getPriority() {
+        return priority;
     }
 
-    public long getTtl() {
-        return ttl;
+    public void setPriority(int priority) {
+        this.priority = priority;
+        configuredQoS();
     }
 
-    /**
-     * Flag used to adjust the Time To Live value of produced messages.
-     */
-    public void setTtl(long ttl) {
-        this.ttl = ttl;
+    public boolean isDeliveryPersistent() {
+        return deliveryPersistent;
     }
 
-    public boolean isPersistent() {
-        return persistent;
+    public void setDeliveryPersistent(boolean deliveryPersistent) {
+        this.deliveryPersistent = deliveryPersistent;
+        configuredQoS();
     }
 
-    /**
-     * Flag used to enable/disable message persistence.
-     */
-    public void setPersistent(boolean persistent) {
-        this.persistent = persistent;
+    public boolean isDisableReplyTo() {
+        return disableReplyTo;
+    }
+
+    public void setDisableReplyTo(boolean disableReplyTo) {
+        this.disableReplyTo = disableReplyTo;
+    }
+
+    public String getReplyToOverride() {
+        return replyToOverride;
+    }
+
+    public void setReplyToOverride(String replyToOverride) {
+        this.replyToOverride = replyToOverride;
+    }
+
+    public boolean isReplyToDeliveryPersistent() {
+        return replyToDeliveryPersistent;
+    }
+
+    public void setReplyToDeliveryPersistent(boolean replyToDeliveryPersistent) {
+        this.replyToDeliveryPersistent = replyToDeliveryPersistent;
+    }
+
+    public Integer getDeliveryMode() {
+        return deliveryMode;
+    }
+
+    public void setDeliveryMode(Integer deliveryMode) {
+        this.deliveryMode = deliveryMode;
+        configuredQoS();
+    }
+
+    public long getTimeToLive() {
+        return timeToLive;
+    }
+
+    public void setTimeToLive(long timeToLive) {
+        this.timeToLive = timeToLive;
+        configuredQoS();
     }
 
     public String getDurableSubscriptionId() {
@@ -503,15 +530,12 @@ public class SjmsEndpoint extends DefaultEndpoint
         this.durableSubscriptionId = durableSubscriptionId;
     }
 
-    public long getResponseTimeOut() {
-        return responseTimeOut;
+    public long getRequestTimeout() {
+        return requestTimeout;
     }
 
-    /**
-     * Sets the amount of time we should wait before timing out a InOut response.
-     */
-    public void setResponseTimeOut(long responseTimeOut) {
-        this.responseTimeOut = responseTimeOut;
+    public void setRequestTimeout(long requestTimeout) {
+        this.requestTimeout = requestTimeout;
     }
 
     public String getMessageSelector() {
@@ -525,32 +549,6 @@ public class SjmsEndpoint extends DefaultEndpoint
         this.messageSelector = messageSelector;
     }
 
-    public int getTransactionBatchCount() {
-        return transactionBatchCount;
-    }
-
-    /**
-     * If transacted sets the number of messages to process before committing a transaction.
-     */
-    @Deprecated
-    public void setTransactionBatchCount(int transactionBatchCount) {
-        this.transactionBatchCount = transactionBatchCount;
-    }
-
-    public long getTransactionBatchTimeout() {
-        return transactionBatchTimeout;
-    }
-
-    /**
-     * Sets timeout (in millis) for batch transactions, the value should be 1000 or higher.
-     */
-    @Deprecated
-    public void setTransactionBatchTimeout(long transactionBatchTimeout) {
-        if (transactionBatchTimeout >= 1000) {
-            this.transactionBatchTimeout = transactionBatchTimeout;
-        }
-    }
-
     public TransactionCommitStrategy getTransactionCommitStrategy() {
         return transactionCommitStrategy;
     }
@@ -589,17 +587,13 @@ public class SjmsEndpoint extends DefaultEndpoint
         this.sharedJMSSession = share;
     }
 
-    public String getNamedReplyTo() {
-        return namedReplyTo;
+    public String getReplyTo() {
+        return replyTo;
     }
 
-    /**
-     * Sets the reply to destination name used for InOut producer endpoints. The type of the reply to destination can be
-     * determined by the starting prefix (topic: or queue:) in its name.
-     */
-    public void setNamedReplyTo(String namedReplyTo) {
-        this.namedReplyTo = namedReplyTo;
-        this.setExchangePattern(ExchangePattern.InOut);
+    public void setReplyTo(String replyTo) {
+        this.replyTo = replyTo;
+        setExchangePattern(ExchangePattern.InOut);
     }
 
     /**
@@ -629,17 +623,6 @@ public class SjmsEndpoint extends DefaultEndpoint
         return asyncStopListener;
     }
 
-    public boolean isPrefillPool() {
-        return prefillPool;
-    }
-
-    /**
-     * Whether to prefill the producer connection pool on startup, or create connections lazy when needed.
-     */
-    public void setPrefillPool(boolean prefillPool) {
-        this.prefillPool = prefillPool;
-    }
-
     public DestinationCreationStrategy getDestinationCreationStrategy() {
         return destinationCreationStrategy;
     }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
index 217ad4f..3ed1034 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
@@ -16,128 +16,41 @@
  */
 package org.apache.camel.component.sjms;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-
 import javax.jms.Connection;
+import javax.jms.DeliveryMode;
+import javax.jms.Destination;
+import javax.jms.JMSException;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
-import org.apache.camel.component.sjms.jms.ConnectionResource;
 import org.apache.camel.component.sjms.tx.SessionTransactionSynchronization;
 import org.apache.camel.support.DefaultAsyncProducer;
-import org.apache.commons.pool.impl.GenericObjectPool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Base SjmsProducer class.
  */
 public abstract class SjmsProducer extends DefaultAsyncProducer {
 
-    private static final Logger LOG = LoggerFactory.getLogger(SjmsProducer.class);
-
-    private GenericObjectPool<MessageProducerResources> producers;
-    private boolean useProducers = true;
-    private ExecutorService executor;
-    private Future<?> asyncStart;
+    protected SjmsTemplate template;
 
     public SjmsProducer(Endpoint endpoint) {
         super(endpoint);
     }
 
-    /**
-     * Used to disable using the internal producer pool when using dynamic endpoints with toD
-     */
-    protected void disableProducers() {
-        useProducers = false;
-    }
-
     @Override
-    protected void doStart() throws Exception {
-        super.doStart();
-
-        if (useProducers) {
-            if (!isSynchronous()) {
-                this.executor
-                        = getEndpoint().getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this,
-                                "SjmsProducer");
-            }
-            if (getProducers() == null) {
-                GenericObjectPool<MessageProducerResources> producers
-                        = new GenericObjectPool<>(new MessageProducerPool(this));
-                setProducers(producers);
-                producers.setMaxActive(getProducerCount());
-                producers.setMaxIdle(getProducerCount());
-                producers.setTestOnBorrow(getEndpoint().getComponent().isConnectionTestOnBorrow());
-                producers.setLifo(false);
-                if (getEndpoint().isPrefillPool()) {
-                    if (getEndpoint().isAsyncStartListener()) {
-                        asyncStart = getEndpoint().getComponent().getAsyncStartStopExecutorService().submit(new Runnable() {
-                            @Override
-                            public void run() {
-                                try {
-                                    fillProducersPool();
-                                } catch (Throwable e) {
-                                    LOG.warn("Error filling producer pool for destination: {}. This exception will be ignored.",
-                                            getDestinationName(), e);
-                                }
-                            }
-
-                            @Override
-                            public String toString() {
-                                return "AsyncStartListenerTask[" + getDestinationName() + "]";
-                            }
-                        });
-                    } else {
-                        fillProducersPool();
-                    }
-                }
+    protected void doInit() throws Exception {
+        template = new SjmsTemplate(getEndpoint().getConnectionFactory(), isEndpointTransacted(), getAcknowledgeMode());
+
+        // configure qos if enabled
+        if (getEndpoint().isExplicitQosEnabled()) {
+            int dm = getEndpoint().isDeliveryPersistent() ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT;
+            if (getEndpoint().getDeliveryMode() != null) {
+                dm = getEndpoint().getDeliveryMode();
             }
-        }
-    }
-
-    private void fillProducersPool() throws Exception {
-        while (producers.getNumIdle() < producers.getMaxIdle()) {
-            producers.addObject();
-        }
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        super.doStop();
-        if (asyncStart != null && !asyncStart.isDone()) {
-            asyncStart.cancel(true);
-        }
-        if (getProducers() != null) {
-            if (getEndpoint().isAsyncStopListener()) {
-                getEndpoint().getComponent().getAsyncStartStopExecutorService().submit(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            getProducers().close();
-                            setProducers(null);
-                        } catch (Throwable e) {
-                            LOG.warn("Error closing producers on destination: {}. This exception will be ignored.",
-                                    getDestinationName(), e);
-                        }
-                    }
-
-                    @Override
-                    public String toString() {
-                        return "AsyncStopListenerTask[" + getDestinationName() + "]";
-                    }
-                });
-            } else {
-                getProducers().close();
-                setProducers(null);
-            }
-        }
-        if (this.executor != null) {
-            getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(this.executor);
+            template.setQoSSettings(dm, getEndpoint().getPriority(), getEndpoint().getTimeToLive());
         }
     }
 
@@ -146,53 +59,12 @@ public abstract class SjmsProducer extends DefaultAsyncProducer {
         return (SjmsEndpoint) super.getEndpoint();
     }
 
-    protected MessageProducerResources doCreateProducerModel(Session session) throws Exception {
-        MessageProducer messageProducer = getEndpoint().getJmsObjectFactory().createMessageProducer(session, getEndpoint());
-        return new MessageProducerResources(session, messageProducer, getCommitStrategy());
-    }
-
-    protected Session createSession() throws Exception {
-        ConnectionResource connectionResource = getOrCreateConnectionResource();
-        Connection conn = connectionResource.borrowConnection();
-        try {
-            return conn.createSession(isEndpointTransacted(), getAcknowledgeMode());
-        } finally {
-            connectionResource.returnConnection(conn);
-        }
-    }
-
-    protected interface ReleaseProducerCallback {
-        void release(MessageProducerResources producer);
-    }
-
-    private static class CloseProducerCallback implements ReleaseProducerCallback {
-        @Override
-        public void release(MessageProducerResources producer) {
-            try {
-                producer.getMessageProducer().close();
-            } catch (Exception e) {
-                // ignore
-            }
-        }
+    protected Destination resolveDestinationName(Session session, String destinationName) throws JMSException {
+        return getEndpoint().getDestinationCreationStrategy().createDestination(session,
+                destinationName, getEndpoint().isTopic());
     }
 
-    private class ReturnProducerCallback implements ReleaseProducerCallback {
-        @Override
-        public void release(MessageProducerResources producer) {
-            try {
-                getProducers().returnObject(producer);
-            } catch (Exception e) {
-                // ignore
-            }
-        }
-    }
-
-    public abstract void sendMessage(
-            Exchange exchange, AsyncCallback callback, MessageProducerResources producer,
-            ReleaseProducerCallback releaseProducerCallback);
-
-    public abstract void sendMessage(
-            Exchange exchange, AsyncCallback callback, Session session, String destinationName);
+    protected abstract void sendMessage(Exchange exchange, Session sharedSession, String destinationName);
 
     @Override
     public boolean process(final Exchange exchange, final AsyncCallback callback) {
@@ -201,150 +73,41 @@ public abstract class SjmsProducer extends DefaultAsyncProducer {
             // remove the header so it wont be propagated
             exchange.getMessage().removeHeader(SjmsConstants.JMS_DESTINATION_NAME);
         }
-        if (destinationName != null) {
-            return doProcess(exchange, callback, destinationName);
-        } else {
-            return doProcess(exchange, callback);
-        }
-    }
-
-    protected boolean doProcess(final Exchange exchange, AsyncCallback callback, final String destinationName) {
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("Processing Exchange.id:{}", exchange.getExchangeId());
-        }
-
-        try {
-            AsyncCallback ac = callback;
-            Session session;
-            if (isEndpointTransacted() && isSharedJMSSession()) {
-                session = exchange.getIn().getHeader(SjmsConstants.JMS_SESSION, Session.class);
-            } else {
-                // TODO: Either rewrite to have connection factory externally pooled
-                // or we have some built in session pooling
-                session = createSession();
-                ac = doneSync -> {
-                    try {
-                        // ensure session is closed after use
-                        session.close();
-                    } catch (Exception e) {
-                        // ignore
-                    }
-                    callback.done(doneSync);
-                };
-            }
-            final AsyncCallback asyncCallback = ac;
-
-            if (!isSynchronous()) {
-                if (LOG.isTraceEnabled()) {
-                    LOG.trace("  Sending message asynchronously: {}", exchange.getExchangeId());
-                }
-                getExecutor().execute(() -> sendMessage(exchange, asyncCallback, session, destinationName));
-                return false;
-            } else {
-                if (LOG.isTraceEnabled()) {
-                    LOG.trace("  Sending message synchronously: {}", exchange.getExchangeId());
-                }
-                sendMessage(exchange, asyncCallback, session, destinationName);
-            }
-        } catch (Exception e) {
-            if (LOG.isTraceEnabled()) {
-                LOG.trace("Processing Exchange.id:{}", exchange.getExchangeId() + " - FAILED");
-            }
-            if (LOG.isTraceEnabled()) {
-                LOG.trace("Exception: {}", e.getMessage(), e);
-            }
-            // an error occurred so set on exchange and call the callback
-            exchange.setException(e);
-            callback.done(true);
-            return true;
-        }
 
-        if (LOG.isTraceEnabled()) {
-            LOG.trace("Processing Exchange.id:{}", exchange.getExchangeId() + " - SUCCESS");
-        }
-        return true;
+        return doProcess(exchange, callback, destinationName);
     }
 
-    protected boolean doProcess(final Exchange exchange, final AsyncCallback callback) {
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("Processing Exchange.id:{}", exchange.getExchangeId());
+    protected boolean doProcess(Exchange exchange, AsyncCallback callback, String destinationName) {
+        if (destinationName == null) {
+            destinationName = getDestinationName();
         }
-
         try {
-            final MessageProducerResources producer;
-            final ReleaseProducerCallback releaseProducerCallback;
-            if (isEndpointTransacted() && isSharedJMSSession()) {
-                Session session = exchange.getIn().getHeader(SjmsConstants.JMS_SESSION, Session.class);
-                if (session != null && session.getTransacted()) {
-                    // Join existing transacted session - Synchronization must have been added
-                    // by the session initiator
-                    producer = doCreateProducerModel(session);
-                    releaseProducerCallback = new CloseProducerCallback();
-                } else {
-                    // Propagate JMS session and register Synchronization as an initiator
-                    producer = getProducers().borrowObject();
-                    releaseProducerCallback = new ReturnProducerCallback();
-                    exchange.getIn().setHeader(SjmsConstants.JMS_SESSION, producer.getSession());
-                    exchange.getUnitOfWork().addSynchronization(
-                            new SessionTransactionSynchronization(producer.getSession(), producer.getCommitStrategy()));
+            if (isEndpointTransacted()) {
+                Connection connection = null;
+                Session session = null;
+                boolean close = false;
+                if (isSharedJMSSession()) {
+                    session = exchange.getIn().getHeader(SjmsConstants.JMS_SESSION, Session.class);
                 }
-            } else {
-                producer = getProducers().borrowObject();
-                releaseProducerCallback = new ReturnProducerCallback();
-                if (isEndpointTransacted()) {
-                    exchange.getUnitOfWork().addSynchronization(
-                            new SessionTransactionSynchronization(producer.getSession(), producer.getCommitStrategy()));
-                }
-            }
-
-            if (!isSynchronous()) {
-                if (LOG.isTraceEnabled()) {
-                    LOG.trace("  Sending message asynchronously: {}", exchange.getExchangeId());
+                if (session == null) {
+                    close = true;
+                    connection = template.createConnection();
+                    session = template.createSession(connection);
                 }
-                getExecutor().execute(() -> sendMessage(exchange, callback, producer, releaseProducerCallback));
-                return false;
+                exchange.getUnitOfWork().addSynchronization(
+                        new SessionTransactionSynchronization(connection, session, getCommitStrategy(), close));
+                sendMessage(exchange, session, destinationName);
             } else {
-                if (LOG.isTraceEnabled()) {
-                    LOG.trace("  Sending message synchronously: {}", exchange.getExchangeId());
-                }
-                sendMessage(exchange, callback, producer, releaseProducerCallback);
-            }
-        } catch (Exception e) {
-            if (LOG.isTraceEnabled()) {
-                LOG.trace("Processing Exchange.id:{}", exchange.getExchangeId() + " - FAILED");
+                sendMessage(exchange, null, destinationName);
             }
-            if (LOG.isTraceEnabled()) {
-                LOG.trace("Exception: {}", e.getMessage(), e);
-            }
-            // an error occurred so set on exchange and call the callback
+        } catch (Throwable e) {
             exchange.setException(e);
-            callback.done(true);
-            return true;
-        }
-
-        if (LOG.isTraceEnabled()) {
-            LOG.trace("Processing Exchange.id:{}", exchange.getExchangeId() + " - SUCCESS");
         }
+        callback.done(true);
         return true;
     }
 
     /**
-     * @deprecated use {@link #getOrCreateConnectionResource()}
-     */
-    @Deprecated
-    protected ConnectionResource getConnectionResource() {
-        return getEndpoint().getConnectionResource();
-    }
-
-    protected ConnectionResource getOrCreateConnectionResource() {
-        ConnectionResource answer = getEndpoint().getConnectionResource();
-        if (answer == null) {
-            answer = getEndpoint().createConnectionResource(this);
-        }
-        return answer;
-    }
-
-    /**
      * Gets the acknowledgment mode for this instance of DestinationProducer.
      */
     public int getAcknowledgeMode() {
@@ -362,7 +125,7 @@ public abstract class SjmsProducer extends DefaultAsyncProducer {
      * Gets the replyTo for this instance of DestinationProducer.
      */
     public String getReplyTo() {
-        return getEndpoint().getNamedReplyTo();
+        return getEndpoint().getReplyTo();
     }
 
     /**
@@ -373,20 +136,6 @@ public abstract class SjmsProducer extends DefaultAsyncProducer {
     }
 
     /**
-     * Sets the producer pool for this instance of SjmsProducer.
-     */
-    public void setProducers(GenericObjectPool<MessageProducerResources> producers) {
-        this.producers = producers;
-    }
-
-    /**
-     * Gets the MessageProducerPool value of producers for this instance of SjmsProducer.
-     */
-    public GenericObjectPool<MessageProducerResources> getProducers() {
-        return producers;
-    }
-
-    /**
      * Test to verify if this endpoint is a JMS Topic or Queue.
      */
     public boolean isTopic() {
@@ -408,20 +157,6 @@ public abstract class SjmsProducer extends DefaultAsyncProducer {
     }
 
     /**
-     * Returns the named reply to value for this producer
-     */
-    public String getNamedReplyTo() {
-        return getEndpoint().getNamedReplyTo();
-    }
-
-    /**
-     * Gets the producerCount for this instance of SjmsProducer.
-     */
-    public int getProducerCount() {
-        return getEndpoint().getProducerCount();
-    }
-
-    /**
      * Gets consumerCount for this instance of SjmsProducer.
      */
     public int getConsumerCount() {
@@ -429,34 +164,6 @@ public abstract class SjmsProducer extends DefaultAsyncProducer {
     }
 
     /**
-     * Gets the executor for this instance of SjmsProducer.
-     */
-    public ExecutorService getExecutor() {
-        return executor;
-    }
-
-    /**
-     * Gets the ttl for this instance of SjmsProducer.
-     */
-    public long getTtl() {
-        return getEndpoint().getTtl();
-    }
-
-    /**
-     * Gets the boolean value of persistent for this instance of SjmsProducer.
-     */
-    public boolean isPersistent() {
-        return getEndpoint().isPersistent();
-    }
-
-    /**
-     * Gets responseTimeOut for this instance of SjmsProducer.
-     */
-    public long getResponseTimeOut() {
-        return getEndpoint().getResponseTimeOut();
-    }
-
-    /**
      * Gets commitStrategy for this instance of SjmsProducer.
      */
     protected TransactionCommitStrategy getCommitStrategy() {
@@ -466,4 +173,14 @@ public abstract class SjmsProducer extends DefaultAsyncProducer {
         return null;
     }
 
+    protected static void close(MessageProducer producer) {
+        if (producer != null) {
+            try {
+                producer.close();
+            } catch (Throwable e) {
+                // ignore
+            }
+        }
+    }
+
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java
new file mode 100644
index 0000000..6461c6e
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java
@@ -0,0 +1,117 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Message;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+
+import org.apache.camel.util.ObjectHelper;
+
+public class SjmsTemplate {
+
+    private final ConnectionFactory connectionFactory;
+    private final boolean transacted;
+    private final int acknowledgeMode;
+
+    private boolean explicitQosEnabled;
+    private int deliveryMode = Message.DEFAULT_DELIVERY_MODE;
+    private int priority = Message.DEFAULT_PRIORITY;
+    private long timeToLive = Message.DEFAULT_TIME_TO_LIVE;
+
+    public SjmsTemplate(ConnectionFactory connectionFactory, boolean transacted, int acknowledgeMode) {
+        ObjectHelper.notNull(connectionFactory, "ConnectionFactory", this);
+
+        this.connectionFactory = connectionFactory;
+        this.transacted = transacted;
+        this.acknowledgeMode = acknowledgeMode;
+    }
+
+    public void setQoSSettings(int deliveryMode, int priority, long timeToLive) {
+        if (deliveryMode != 0) {
+            this.deliveryMode = deliveryMode;
+            this.explicitQosEnabled = true;
+        }
+        if (priority != 0) {
+            this.priority = priority;
+            this.explicitQosEnabled = true;
+        }
+        if (timeToLive != 0) {
+            this.timeToLive = timeToLive;
+            this.explicitQosEnabled = true;
+        }
+    }
+
+    public <T> T execute(SessionCallback<T> sessionCallback) throws Exception {
+        Connection con = null;
+        Session session = null;
+        try {
+            con = createConnection();
+            session = createSession(con);
+            return sessionCallback.doInJms(session);
+        } finally {
+            close(session);
+            close(con);
+        }
+    }
+
+    public <T> T execute(Session session, SessionCallback<T> sessionCallback) throws Exception {
+        if (session == null) {
+            return execute(sessionCallback);
+        } else {
+            return sessionCallback.doInJms(session);
+        }
+    }
+
+    public void send(MessageProducer producer, Message message) throws Exception {
+        if (explicitQosEnabled) {
+            producer.send(message, deliveryMode, priority, timeToLive);
+        } else {
+            producer.send(message);
+        }
+    }
+
+    public Connection createConnection() throws Exception {
+        return connectionFactory.createConnection();
+    }
+
+    public Session createSession(Connection connection) throws Exception {
+        return connection.createSession(transacted, acknowledgeMode);
+    }
+
+    private static void close(Connection con) {
+        if (con != null) {
+            try {
+                con.close();
+            } catch (Throwable e) {
+                // ignore
+            }
+        }
+    }
+
+    private static void close(Session session) {
+        if (session != null) {
+            try {
+                session.close();
+            } catch (Throwable e) {
+                // ignore
+            }
+        }
+    }
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SessionCompletion.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SessionCompletion.java
deleted file mode 100644
index 5b856f6..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SessionCompletion.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.batch;
-
-import javax.jms.JMSException;
-import javax.jms.Session;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.spi.Synchronization;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class SessionCompletion implements Synchronization {
-    private static final Logger LOG = LoggerFactory.getLogger(SessionCompletion.class);
-
-    private final Session session;
-
-    // TODO: add more details in the commit/rollback eg such as message id
-
-    SessionCompletion(Session session) {
-        this.session = session;
-    }
-
-    @Override
-    public void onComplete(Exchange exchange) {
-        try {
-            LOG.debug("Committing");
-            session.commit();
-        } catch (JMSException ex) {
-            LOG.warn("Exception caught while committing JMS session", ex);
-        }
-    }
-
-    @Override
-    public void onFailure(Exchange exchange) {
-        try {
-            LOG.debug("Rolling back");
-            session.rollback();
-        } catch (JMSException ex) {
-            LOG.warn("Exception caught while rolling back JMS session", ex);
-        }
-    }
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchComponent.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchComponent.java
deleted file mode 100644
index ddb0dce..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchComponent.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.batch;
-
-import java.util.Map;
-
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.annotations.Component;
-import org.apache.camel.support.HeaderFilterStrategyComponent;
-import org.apache.camel.util.ObjectHelper;
-
-@Component("sjms-batch")
-public class SjmsBatchComponent extends HeaderFilterStrategyComponent {
-
-    @Metadata(label = "advanced")
-    private ConnectionFactory connectionFactory;
-    @Metadata(label = "advanced")
-    private boolean asyncStartListener;
-    @Metadata(label = "advanced", defaultValue = "5000")
-    private int recoveryInterval = 5000;
-
-    public SjmsBatchComponent() {
-    }
-
-    @Override
-    protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-        ConnectionFactory cf = resolveAndRemoveReferenceParameter(parameters, "connectionFactory", ConnectionFactory.class);
-        if (cf != null) {
-            setConnectionFactory(cf);
-        }
-        ObjectHelper.notNull(connectionFactory, "connectionFactory");
-
-        SjmsBatchEndpoint answer = new SjmsBatchEndpoint(uri, this, remaining);
-        answer.setAsyncStartListener(isAsyncStartListener());
-        answer.setRecoveryInterval(getRecoveryInterval());
-        setProperties(answer, parameters);
-
-        return answer;
-    }
-
-    public ConnectionFactory getConnectionFactory() {
-        return connectionFactory;
-    }
-
-    /**
-     * A ConnectionFactory is required to enable the SjmsBatchComponent.
-     */
-    public void setConnectionFactory(ConnectionFactory connectionFactory) {
-        this.connectionFactory = connectionFactory;
-    }
-
-    public boolean isAsyncStartListener() {
-        return asyncStartListener;
-    }
-
-    /**
-     * Whether to startup the consumer message listener asynchronously, when starting a route. For example if a
-     * JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover.
-     * This will cause Camel to block while starting routes. By setting this option to true, you will let routes
-     * startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this
-     * option is used, then beware that if the connection could not be established, then an exception is logged at WARN
-     * level, and the consumer will not be able to receive messages; You can then restart the route to retry.
-     */
-    public void setAsyncStartListener(boolean asyncStartListener) {
-        this.asyncStartListener = asyncStartListener;
-    }
-
-    public int getRecoveryInterval() {
-        return recoveryInterval;
-    }
-
-    /**
-     * Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The
-     * default is 5000 ms, that is, 5 seconds.
-     */
-    public void setRecoveryInterval(int recoveryInterval) {
-        this.recoveryInterval = recoveryInterval;
-    }
-
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
deleted file mode 100644
index dccf643..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
+++ /dev/null
@@ -1,604 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.batch;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.Queue;
-import javax.jms.Session;
-
-import org.apache.camel.AggregationStrategy;
-import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedExchange;
-import org.apache.camel.Predicate;
-import org.apache.camel.Processor;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.spi.ExecutorServiceManager;
-import org.apache.camel.support.DefaultConsumer;
-import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.StringHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SjmsBatchConsumer extends DefaultConsumer {
-
-    public static final String SJMS_BATCH_TIMEOUT_CHECKER = "SJmsBatchTimeoutChecker";
-
-    private static final boolean TRANSACTED = true;
-    private static final Logger LOG = LoggerFactory.getLogger(SjmsBatchConsumer.class);
-
-    // global counters, maybe they should be on component instead?
-    private static final AtomicInteger BATCH_COUNT = new AtomicInteger();
-    private static final AtomicLong MESSAGE_RECEIVED = new AtomicLong();
-    private static final AtomicLong MESSAGE_PROCESSED = new AtomicLong();
-
-    private ScheduledExecutorService timeoutCheckerExecutorService;
-    private boolean shutdownTimeoutCheckerExecutorService;
-
-    private final SjmsBatchEndpoint sjmsBatchEndpoint;
-    private final AggregationStrategy aggregationStrategy;
-    private final int completionSize;
-    private final int completionInterval;
-    private final int completionTimeout;
-    private final Predicate completionPredicate;
-    private final boolean eagerCheckCompletion;
-    private final int consumerCount;
-    private final int pollDuration;
-    private final ConnectionFactory connectionFactory;
-    private final String destinationName;
-    private ExecutorService jmsConsumerExecutors;
-    private final AtomicBoolean running = new AtomicBoolean();
-    private final AtomicReference<CountDownLatch> consumersShutdownLatchRef = new AtomicReference<>();
-    private volatile Connection connection;
-
-    public SjmsBatchConsumer(SjmsBatchEndpoint sjmsBatchEndpoint, Processor processor) {
-        super(sjmsBatchEndpoint, processor);
-
-        this.sjmsBatchEndpoint = ObjectHelper.notNull(sjmsBatchEndpoint, "batchJmsEndpoint");
-
-        destinationName = StringHelper.notEmpty(sjmsBatchEndpoint.getDestinationName(), "destinationName");
-
-        completionSize = sjmsBatchEndpoint.getCompletionSize();
-        completionInterval = sjmsBatchEndpoint.getCompletionInterval();
-        completionTimeout = sjmsBatchEndpoint.getCompletionTimeout();
-        if (completionInterval > 0 && completionTimeout != SjmsBatchEndpoint.DEFAULT_COMPLETION_TIMEOUT) {
-            throw new IllegalArgumentException("Only one of completionInterval or completionTimeout can be used, not both.");
-        }
-        if (sjmsBatchEndpoint.isSendEmptyMessageWhenIdle() && completionTimeout <= 0 && completionInterval <= 0) {
-            throw new IllegalArgumentException(
-                    "SendEmptyMessageWhenIdle can only be enabled if either completionInterval or completionTimeout is also set");
-        }
-        completionPredicate = sjmsBatchEndpoint.getCompletionPredicate();
-        eagerCheckCompletion = sjmsBatchEndpoint.isEagerCheckCompletion();
-
-        pollDuration = sjmsBatchEndpoint.getPollDuration();
-        if (pollDuration < 0) {
-            throw new IllegalArgumentException("pollDuration must be 0 or greater");
-        }
-
-        this.aggregationStrategy = ObjectHelper.notNull(sjmsBatchEndpoint.getAggregationStrategy(), "aggregationStrategy");
-
-        consumerCount = sjmsBatchEndpoint.getConsumerCount();
-        if (consumerCount <= 0) {
-            throw new IllegalArgumentException("consumerCount must be greater than 0");
-        }
-
-        SjmsBatchComponent sjmsBatchComponent = sjmsBatchEndpoint.getComponent();
-        connectionFactory
-                = ObjectHelper.notNull(sjmsBatchComponent.getConnectionFactory(), "jmsBatchComponent.connectionFactory");
-    }
-
-    @Override
-    public SjmsBatchEndpoint getEndpoint() {
-        return sjmsBatchEndpoint;
-    }
-
-    public ScheduledExecutorService getTimeoutCheckerExecutorService() {
-        return timeoutCheckerExecutorService;
-    }
-
-    public void setTimeoutCheckerExecutorService(ScheduledExecutorService timeoutCheckerExecutorService) {
-        this.timeoutCheckerExecutorService = timeoutCheckerExecutorService;
-    }
-
-    @Override
-    protected void doStart() throws Exception {
-        super.doStart();
-
-        boolean recovery = getEndpoint().isAsyncStartListener();
-        StartConsumerTask task
-                = new StartConsumerTask(recovery, getEndpoint().getRecoveryInterval(), getEndpoint().getKeepAliveDelay());
-
-        if (recovery) {
-            // use a background thread to keep starting the consumer until it can connect successfully
-            String threadNameSuffix = "AsyncStartStopListener[" + destinationName + "]";
-            ExecutorServiceManager executorServiceManager = getEndpoint().getCamelContext().getExecutorServiceManager();
-            Thread thread = executorServiceManager.newThread(threadNameSuffix, task);
-            thread.start();
-        } else {
-            task.run();
-        }
-    }
-
-    /**
-     * Task to startup the consumer either synchronously or using asynchronous with recovery
-     */
-    protected class StartConsumerTask implements Runnable {
-
-        private boolean recoveryEnabled;
-        private int recoveryInterval;
-        private int keepAliveDelay;
-        private long attempt;
-
-        public StartConsumerTask(boolean recoveryEnabled, int recoveryInterval, int keepAliveDelay) {
-            this.recoveryEnabled = recoveryEnabled;
-            this.recoveryInterval = recoveryInterval;
-            this.keepAliveDelay = keepAliveDelay;
-        }
-
-        @Override
-        public void run() {
-            jmsConsumerExecutors = getEndpoint().getCamelContext().getExecutorServiceManager().newFixedThreadPool(this,
-                    "SjmsBatchConsumer", consumerCount);
-            consumersShutdownLatchRef.set(new CountDownLatch(consumerCount));
-
-            if (completionInterval > 0) {
-                LOG.info("Using CompletionInterval to run every {} millis for {}.", completionInterval, destinationName);
-                if (timeoutCheckerExecutorService == null) {
-                    setTimeoutCheckerExecutorService(getEndpoint().getCamelContext().getExecutorServiceManager()
-                            .newScheduledThreadPool(this, SJMS_BATCH_TIMEOUT_CHECKER, 1));
-                    shutdownTimeoutCheckerExecutorService = true;
-                }
-            }
-
-            // keep loop until we can connect
-            while (isRunAllowed() && !running.get()) {
-                Connection localConnection = null;
-                try {
-                    attempt++;
-
-                    LOG.debug("Attempt #{}. Starting {} consumer(s) for {}:{}", attempt, consumerCount, destinationName,
-                            completionSize);
-
-                    // start up a shared connection
-                    localConnection = connectionFactory.createConnection();
-                    localConnection.start();
-
-                    // its success so prepare for exit
-                    connection = localConnection;
-                    running.set(true);
-
-                    final List<AtomicBoolean> triggers = new ArrayList<>();
-                    for (int i = 0; i < consumerCount; i++) {
-                        BatchConsumptionLoop loop = new BatchConsumptionLoop();
-                        loop.setKeepAliveDelay(keepAliveDelay);
-                        triggers.add(loop.getCompletionTimeoutTrigger());
-                        jmsConsumerExecutors.submit(loop);
-                    }
-
-                    if (completionInterval > 0) {
-                        // trigger completion based on interval
-                        timeoutCheckerExecutorService.scheduleAtFixedRate(new CompletionIntervalTask(triggers),
-                                completionInterval, completionInterval, TimeUnit.MILLISECONDS);
-                    }
-
-                    if (attempt > 1) {
-                        LOG.info("Successfully refreshed connection to {} after {} attempts.", destinationName, attempt);
-                    }
-
-                    LOG.info("Started {} consumer(s) for {}:{}", consumerCount, destinationName, completionSize);
-                    return;
-                } catch (Throwable e) {
-                    // we failed so close the local connection as we create a new on next attempt
-                    try {
-                        if (localConnection != null) {
-                            localConnection.close();
-                        }
-                    } catch (Throwable t) {
-                        // ignore
-                    }
-
-                    if (recoveryEnabled) {
-                        getExceptionHandler().handleException("Error starting consumer after " + attempt
-                                                              + " attempts. Will try again in " + recoveryInterval + " millis.",
-                                e);
-                    } else {
-                        throw RuntimeCamelException.wrapRuntimeCamelException(e);
-                    }
-                }
-
-                // sleeping before next attempt
-                try {
-                    LOG.debug("Attempt #{}. Sleeping {} before next attempt to recover {}", attempt, recoveryInterval,
-                            destinationName);
-                    Thread.sleep(recoveryInterval);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    return;
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        super.doStop();
-        running.set(false);
-
-        CountDownLatch consumersShutdownLatch = consumersShutdownLatchRef.get();
-        if (consumersShutdownLatch != null) {
-            LOG.info("Stop signalled, waiting on consumers for {} to shut down", destinationName);
-            if (consumersShutdownLatch.await(60, TimeUnit.SECONDS)) {
-                LOG.warn("Timeout waiting on consumer threads for {} to signal completion - shutting down", destinationName);
-            } else {
-                LOG.info("All consumers for {} have been shutdown", destinationName);
-            }
-        } else {
-            LOG.info("Stop signalled while there are no consumers for {} yet, so no need to wait for consumers",
-                    destinationName);
-        }
-
-        try {
-            LOG.debug("Shutting down JMS connection for {}", destinationName);
-            connection.close();
-        } catch (Exception e) {
-            // ignore
-        }
-
-        getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(jmsConsumerExecutors);
-        jmsConsumerExecutors = null;
-
-        if (shutdownTimeoutCheckerExecutorService) {
-            getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(timeoutCheckerExecutorService);
-            timeoutCheckerExecutorService = null;
-        }
-    }
-
-    /**
-     * Background task that triggers completion based on interval.
-     */
-    private final class CompletionIntervalTask implements Runnable {
-
-        private final List<AtomicBoolean> triggers;
-
-        CompletionIntervalTask(List<AtomicBoolean> triggers) {
-            this.triggers = triggers;
-        }
-
-        @Override
-        public void run() {
-            // only run if CamelContext has been fully started
-            if (!getEndpoint().getCamelContext().getStatus().isStarted()) {
-                LOG.trace("Completion interval task cannot start due CamelContext({}) has not been started yet",
-                        getEndpoint().getCamelContext().getName());
-                return;
-            }
-
-            // signal
-            for (AtomicBoolean trigger : triggers) {
-                trigger.set(true);
-            }
-        }
-    }
-
-    private class BatchConsumptionLoop implements Runnable {
-
-        private final AtomicBoolean completionTimeoutTrigger = new AtomicBoolean();
-        private final BatchConsumptionTask task = new BatchConsumptionTask(completionTimeoutTrigger);
-        private int keepAliveDelay;
-
-        public AtomicBoolean getCompletionTimeoutTrigger() {
-            return completionTimeoutTrigger;
-        }
-
-        public void setKeepAliveDelay(int i) {
-            keepAliveDelay = i;
-        }
-
-        @Override
-        public void run() {
-            try {
-                // This loop is intended to keep the consumer up and running as long as it's supposed to be, but allow it to bail if signaled.
-                // I'm using a do/while loop because the first time through we want to attempt it regardless of any other conditions... we
-                // only want to try AGAIN if the keepAlive is set.
-                do {
-                    // a batch corresponds to a single session that will be committed or rolled back by a background thread
-                    Session session = null;
-                    try {
-                        session = connection.createSession(TRANSACTED, Session.CLIENT_ACKNOWLEDGE);
-                        // only batch consumption from queues is supported - it makes no sense to transactionally consume
-                        // from a topic as you don't car about message loss, users can just use a regular aggregator instead
-                        Queue queue = session.createQueue(destinationName);
-                        MessageConsumer consumer = session.createConsumer(queue);
-                        try {
-                            task.consumeBatchesOnLoop(session, consumer);
-                        } finally {
-                            closeJmsConsumer(consumer);
-                        }
-                    } catch (Exception ex) {
-                        // from consumeBatchesOnLoop
-                        // if keepAliveDelay was not specified (defaults to -1) just rethrow to break the loop. This preserves original default behavior
-                        if (keepAliveDelay < 0) {
-                            throw ex;
-                        }
-                        // this will log the exception and the parent loop will create a new session
-                        getExceptionHandler().handleException("Exception caught consuming from " + destinationName, ex);
-                        //sleep to avoid log spamming
-                        if (keepAliveDelay > 0) {
-                            Thread.sleep(keepAliveDelay);
-                        }
-                    } finally {
-                        closeJmsSession(session);
-                    }
-                } while (running.get() || isStarting());
-            } catch (Throwable ex) {
-                // from consumeBatchesOnLoop
-                // catch anything besides the IllegalStateException and exit the application
-                getExceptionHandler().handleException(
-                        "Exiting consumption loop due to exception caught consuming from " + destinationName, ex);
-            } finally {
-                // indicate that we have shut down
-                CountDownLatch consumersShutdownLatch = consumersShutdownLatchRef.get();
-                consumersShutdownLatch.countDown();
-            }
-        }
-
-        private void closeJmsConsumer(MessageConsumer consumer) {
-            try {
-                consumer.close();
-            } catch (JMSException ex2) {
-                // only include stacktrace in debug logging
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("Exception caught closing consumer", ex2);
-                }
-                LOG.warn("Exception caught closing consumer for {}: {}. This exception is ignored.", destinationName,
-                        ex2.getMessage());
-            }
-        }
-
-        private void closeJmsSession(Session session) {
-            try {
-                if (session != null) {
-                    session.close();
-                }
-            } catch (JMSException ex2) {
-                // only include stacktrace in debug logging
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("Exception caught closing session", ex2);
-                }
-                LOG.warn("Exception caught closing session for {}: {}. This exception is ignored.", destinationName,
-                        ex2.getMessage());
-            }
-        }
-
-        private final class BatchConsumptionTask {
-
-            // state
-            private final AtomicBoolean timeoutInterval;
-            private final AtomicBoolean timeout = new AtomicBoolean();
-            private int messageCount;
-            private long timeElapsed;
-            private long startTime;
-            private Exchange aggregatedExchange;
-
-            BatchConsumptionTask(AtomicBoolean timeoutInterval) {
-                this.timeoutInterval = timeoutInterval;
-            }
-
-            private void consumeBatchesOnLoop(final Session session, final MessageConsumer consumer) throws JMSException {
-                final boolean usingTimeout = completionTimeout > 0;
-
-                LOG.trace("BatchConsumptionTask +++ start +++");
-
-                while (running.get()) {
-
-                    LOG.trace("BatchConsumptionTask running");
-
-                    if (timeout.compareAndSet(true, false) || timeoutInterval.compareAndSet(true, false)) {
-                        // trigger timeout
-                        LOG.trace("Completion batch due timeout");
-                        String completedBy = completionInterval > 0 ? "interval" : "timeout";
-                        completionBatch(session, completedBy);
-                        reset();
-                        continue;
-                    }
-
-                    if (completionSize > 0 && messageCount >= completionSize) {
-                        // trigger completion size
-                        LOG.trace("Completion batch due size");
-                        completionBatch(session, "size");
-                        reset();
-                        continue;
-                    }
-
-                    // check periodically to see whether we should be shutting down
-                    long waitTime = (usingTimeout && (timeElapsed > 0))
-                            ? getReceiveWaitTime(timeElapsed)
-                            : pollDuration;
-
-                    Message message = consumer.receive(waitTime);
-
-                    if (running.get()) {
-                        // no interruptions received
-                        if (message == null) {
-                            // timed out, no message received
-                            LOG.trace("No message received");
-                        } else {
-                            messageCount++;
-                            LOG.debug("#{} messages received", messageCount);
-
-                            if (usingTimeout && startTime == 0) {
-                                // this is the first message start counting down the period for this batch
-                                startTime = new Date().getTime();
-                            }
-
-                            final Exchange exchange = getEndpoint().createExchange(message, session);
-                            aggregatedExchange = aggregationStrategy.aggregate(aggregatedExchange, exchange);
-                            aggregatedExchange.setProperty(Exchange.BATCH_SIZE, messageCount);
-
-                            // is the batch complete by predicate?
-                            if (completionPredicate != null) {
-                                try {
-                                    boolean complete;
-                                    if (eagerCheckCompletion) {
-                                        complete = completionPredicate.matches(exchange);
-                                    } else {
-                                        complete = completionPredicate.matches(aggregatedExchange);
-                                    }
-                                    if (complete) {
-                                        // trigger completion predicate
-                                        LOG.trace("Completion batch due predicate");
-                                        completionBatch(session, "predicate");
-                                        reset();
-                                    }
-                                } catch (Exception e) {
-                                    LOG.warn("Error during evaluation of completion predicate {}. This exception is ignored.",
-                                            e.getMessage(), e);
-                                }
-                            }
-                        }
-
-                        if (usingTimeout && startTime > 0) {
-                            // a batch has been started, check whether it should be timed out
-                            long currentTime = new Date().getTime();
-                            timeElapsed = currentTime - startTime;
-
-                            if (timeElapsed > completionTimeout) {
-                                // batch finished by timeout
-                                timeout.set(true);
-                            } else {
-                                LOG.trace("This batch has more time until the timeout, elapsed: {} timeout: {}", timeElapsed,
-                                        completionTimeout);
-                            }
-                        }
-
-                    } else {
-                        LOG.info("Shutdown signal received - rolling back {} pending in batch from destination {}",
-                                messageCount, destinationName);
-                        session.rollback();
-                    }
-                }
-
-                LOG.trace("BatchConsumptionTask +++ end +++");
-            }
-
-            private void reset() {
-                messageCount = 0;
-                timeElapsed = 0;
-                startTime = 0;
-                aggregatedExchange = null;
-            }
-
-            private void completionBatch(final Session session, String completedBy) {
-                // batch
-                if (aggregatedExchange == null && getEndpoint().isSendEmptyMessageWhenIdle()) {
-                    processEmptyMessage();
-                } else if (aggregatedExchange != null) {
-                    processBatch(aggregatedExchange, session, completedBy);
-                }
-            }
-
-        }
-
-        /**
-         * Determine the time that a call to {@link MessageConsumer#receive()} should wait given the time that has
-         * elapsed for this batch.
-         *
-         * @param  timeElapsed The time that has elapsed.
-         * @return             The shorter of the time remaining or poll duration.
-         */
-        private long getReceiveWaitTime(long timeElapsed) {
-            long timeRemaining = getTimeRemaining(timeElapsed);
-
-            // wait for the shorter of the time remaining or the poll duration
-            if (timeRemaining <= 0) { // ensure that the thread doesn't wait indefinitely
-                timeRemaining = 1;
-            }
-            final long waitTime = Math.min(timeRemaining, pollDuration);
-
-            LOG.trace("Waiting for {}", waitTime);
-            return waitTime;
-        }
-
-        private long getTimeRemaining(long timeElapsed) {
-            long timeRemaining = completionTimeout - timeElapsed;
-            if (LOG.isDebugEnabled() && timeElapsed > 0) {
-                LOG.debug("Time remaining this batch: {}", timeRemaining);
-            }
-            return timeRemaining;
-        }
-
-        /**
-         * No messages in batch so send an empty message instead.
-         */
-        private void processEmptyMessage() {
-            Exchange exchange = getEndpoint().createExchange();
-            LOG.debug("Sending empty message as there were no messages from polling: {}", getEndpoint());
-            try {
-                getProcessor().process(exchange);
-            } catch (Exception e) {
-                getExceptionHandler().handleException("Error processing exchange", exchange, e);
-            }
-        }
-
-        /**
-         * Send an message with the batches messages.
-         */
-        private void processBatch(Exchange exchange, Session session, String completedBy) {
-            int id = BATCH_COUNT.getAndIncrement();
-            int batchSize = exchange.getProperty(Exchange.BATCH_SIZE, Integer.class);
-            if (LOG.isDebugEnabled()) {
-                long total = MESSAGE_RECEIVED.get() + batchSize;
-                LOG.debug("Processing batch[{}]:size={}:total={}", id, batchSize, total);
-            }
-
-            if ("timeout".equals(completedBy)) {
-                aggregationStrategy.timeout(exchange, id, batchSize, completionTimeout);
-            }
-            exchange.setProperty(Exchange.AGGREGATED_COMPLETED_BY, completedBy);
-
-            // invoke the on completion callback
-            aggregationStrategy.onCompletion(exchange);
-
-            SessionCompletion sessionCompletion = new SessionCompletion(session);
-            exchange.adapt(ExtendedExchange.class).addOnCompletion(sessionCompletion);
-            try {
-                getProcessor().process(exchange);
-                long total = MESSAGE_PROCESSED.addAndGet(batchSize);
-                LOG.debug("Completed processing[{}]:total={}", id, total);
-            } catch (Exception e) {
-                getExceptionHandler().handleException("Error processing exchange from " + destinationName, exchange, e);
-            }
-        }
-
-    }
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java
deleted file mode 100644
index 3a29049..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.batch;
-
-import java.util.concurrent.ScheduledExecutorService;
-
-import javax.jms.Message;
-import javax.jms.Session;
-
-import org.apache.camel.AggregationStrategy;
-import org.apache.camel.Category;
-import org.apache.camel.Component;
-import org.apache.camel.Consumer;
-import org.apache.camel.Exchange;
-import org.apache.camel.Predicate;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.component.sjms.SjmsHeaderFilterStrategy;
-import org.apache.camel.component.sjms.SjmsMessage;
-import org.apache.camel.component.sjms.jms.DefaultJmsKeyFormatStrategy;
-import org.apache.camel.component.sjms.jms.DestinationNameParser;
-import org.apache.camel.component.sjms.jms.JmsBinding;
-import org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy;
-import org.apache.camel.component.sjms.jms.MessageCreatedStrategy;
-import org.apache.camel.spi.HeaderFilterStrategy;
-import org.apache.camel.spi.HeaderFilterStrategyAware;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriPath;
-import org.apache.camel.support.DefaultEndpoint;
-
-/**
- * Highly performant and transactional batch consumption of messages from a JMS queue.
- */
-@UriEndpoint(firstVersion = "2.16.0", scheme = "sjms-batch", title = "Simple JMS Batch", syntax = "sjms-batch:destinationName",
-             category = { Category.MESSAGING }, consumerOnly = true)
-public class SjmsBatchEndpoint extends DefaultEndpoint implements HeaderFilterStrategyAware {
-
-    public static final int DEFAULT_COMPLETION_SIZE = 200; // the default dispatch queue size in ActiveMQ
-    public static final int DEFAULT_COMPLETION_TIMEOUT = 500;
-
-    private JmsBinding binding;
-
-    @UriPath
-    @Metadata(required = true)
-    private String destinationName;
-    @UriParam
-    @Metadata(required = true)
-    private AggregationStrategy aggregationStrategy;
-    @UriParam(defaultValue = "1")
-    private int consumerCount = 1;
-    @UriParam(defaultValue = "200")
-    private int completionSize = DEFAULT_COMPLETION_SIZE;
-    @UriParam(defaultValue = "500")
-    private int completionTimeout = DEFAULT_COMPLETION_TIMEOUT;
-    @UriParam(defaultValue = "1000")
-    private int completionInterval;
-    @UriParam(javaType = "java.lang.String")
-    private Predicate completionPredicate;
-    @UriParam
-    private boolean eagerCheckCompletion;
-    @UriParam
-    private boolean sendEmptyMessageWhenIdle;
-    @UriParam(defaultValue = "1000")
-    private int pollDuration = 1000;
-    @UriParam
-    private boolean includeAllJMSXProperties;
-    @UriParam(defaultValue = "true")
-    private boolean allowNullBody = true;
-    @UriParam(defaultValue = "true")
-    private boolean mapJmsMessage = true;
-    @UriParam(label = "advanced")
-    private HeaderFilterStrategy headerFilterStrategy;
-    @UriParam(label = "advanced")
-    private MessageCreatedStrategy messageCreatedStrategy;
-    @UriParam(label = "advanced")
-    private JmsKeyFormatStrategy jmsKeyFormatStrategy;
-    @UriParam(label = "advanced")
-    private ScheduledExecutorService timeoutCheckerExecutorService;
-    @UriParam(label = "advanced")
-    private boolean asyncStartListener;
-    @UriParam(label = "advanced", defaultValue = "5000")
-    private int recoveryInterval = 5000;
-    @UriParam(label = "advanced", defaultValue = "5000")
-    private int keepAliveDelay = 5000;
-
-    public SjmsBatchEndpoint() {
-    }
-
-    public SjmsBatchEndpoint(String endpointUri, Component component, String remaining) {
-        super(endpointUri, component);
-
-        if (DestinationNameParser.isTopic(remaining)) {
-            throw new IllegalArgumentException(
-                    "Only batch consumption from queues is supported. For topics you "
-                                               + "should use a regular JMS consumer with an aggregator.");
-        }
-        this.destinationName = DestinationNameParser.getShortName(remaining);
-    }
-
-    @Override
-    public SjmsBatchComponent getComponent() {
-        return (SjmsBatchComponent) super.getComponent();
-    }
-
-    @Override
-    public Producer createProducer() throws Exception {
-        throw new UnsupportedOperationException("Producer not supported");
-    }
-
-    @Override
-    public Consumer createConsumer(Processor processor) throws Exception {
-        SjmsBatchConsumer consumer = new SjmsBatchConsumer(this, processor);
-        consumer.setTimeoutCheckerExecutorService(timeoutCheckerExecutorService);
-        configureConsumer(consumer);
-        return consumer;
-    }
-
-    public Exchange createExchange(Message message, Session session) {
-        Exchange exchange = createExchange(getExchangePattern());
-        exchange.setIn(new SjmsMessage(exchange, message, session, getBinding()));
-        return exchange;
-    }
-
-    public JmsBinding getBinding() {
-        if (binding == null) {
-            binding = createBinding();
-        }
-        return binding;
-    }
-
-    /**
-     * Creates the {@link org.apache.camel.component.sjms.jms.JmsBinding} to use.
-     */
-    protected JmsBinding createBinding() {
-        return new JmsBinding(
-                isMapJmsMessage(), isAllowNullBody(), getHeaderFilterStrategy(), getJmsKeyFormatStrategy(),
-                getMessageCreatedStrategy());
-    }
-
-    /**
-     * Sets the binding used to convert from a Camel message to and from a JMS message
-     */
-    public void setBinding(JmsBinding binding) {
-        this.binding = binding;
-    }
-
-    public AggregationStrategy getAggregationStrategy() {
-        return aggregationStrategy;
-    }
-
-    /**
-     * The aggregation strategy to use, which merges all the batched messages into a single message
-     */
-    public void setAggregationStrategy(AggregationStrategy aggregationStrategy) {
-        this.aggregationStrategy = aggregationStrategy;
-    }
-
-    /**
-     * The destination name. Only queues are supported, names may be prefixed by 'queue:'.
-     */
-    public String getDestinationName() {
-        return destinationName;
-    }
-
-    public int getConsumerCount() {
-        return consumerCount;
-    }
-
-    /**
-     * The number of JMS sessions to consume from
-     */
-    public void setConsumerCount(int consumerCount) {
-        this.consumerCount = consumerCount;
-    }
-
-    public int getCompletionSize() {
-        return completionSize;
-    }
-
-    /**
-     * The number of messages consumed at which the batch will be completed
-     */
-    public void setCompletionSize(int completionSize) {
-        this.completionSize = completionSize;
-    }
-
-    public int getCompletionTimeout() {
-        return completionTimeout;
-    }
-
-    /**
-     * The timeout in millis from receipt of the first first message when the batch will be completed. The batch may be
-     * empty if the timeout triggered and there was no messages in the batch. <br/>
-     * Notice you cannot use both completion timeout and completion interval at the same time, only one can be
-     * configured.
-     */
-    public void setCompletionTimeout(int completionTimeout) {
-        this.completionTimeout = completionTimeout;
-    }
-
-    public int getCompletionInterval() {
-        return completionInterval;
-    }
-
-    /**
-     * The completion interval in millis, which causes batches to be completed in a scheduled fixed rate every interval.
-     * The batch may be empty if the timeout triggered and there was no messages in the batch. <br/>
-     * Notice you cannot use both completion timeout and completion interval at the same time, only one can be
-     * configured.
-     */
-    public void setCompletionInterval(int completionInterval) {
-        this.completionInterval = completionInterval;
-    }
-
-    public Predicate getCompletionPredicate() {
-        return completionPredicate;
-    }
-
-    /**
-     * The completion predicate, which causes batches to be completed when the predicate evaluates as true.
-     * <p/>
-     * The predicate can also be configured using the simple language using the string syntax. You may want to set the
-     * option eagerCheckCompletion to true to let the predicate match the incoming message, as otherwise it matches the
-     * aggregated message.
-     */
-    public void setCompletionPredicate(Predicate completionPredicate) {
-        this.completionPredicate = completionPredicate;
-    }
-
-    public void setCompletionPredicate(String predicate) {
-        // uses simple language
-        this.completionPredicate = getCamelContext().resolveLanguage("simple").createPredicate(predicate);
-    }
-
-    public boolean isEagerCheckCompletion() {
-        return eagerCheckCompletion;
-    }
-
-    /**
-     * Use eager completion checking which means that the completionPredicate will use the incoming Exchange. As opposed
-     * to without eager completion checking the completionPredicate will use the aggregated Exchange.
-     */
-    public void setEagerCheckCompletion(boolean eagerCheckCompletion) {
-        this.eagerCheckCompletion = eagerCheckCompletion;
-    }
-
-    public boolean isSendEmptyMessageWhenIdle() {
-        return sendEmptyMessageWhenIdle;
-    }
-
-    /**
-     * If using completion timeout or interval, then the batch may be empty if the timeout triggered and there was no
-     * messages in the batch. If this option is <tt>true</tt> and the batch is empty then an empty message is added to
-     * the batch so an empty message is routed.
-     */
-    public void setSendEmptyMessageWhenIdle(boolean sendEmptyMessageWhenIdle) {
-        this.sendEmptyMessageWhenIdle = sendEmptyMessageWhenIdle;
-    }
-
-    public int getPollDuration() {
-        return pollDuration;
-    }
-
-    /**
-     * The duration in milliseconds of each poll for messages. completionTimeOut will be used if it is shorter and a
-     * batch has started.
-     */
-    public void setPollDuration(int pollDuration) {
-        this.pollDuration = pollDuration;
-    }
-
-    public boolean isAllowNullBody() {
-        return allowNullBody;
-    }
-
-    /**
-     * Whether to allow sending messages with no body. If this option is false and the message body is null, then an
-     * JMSException is thrown.
-     */
-    public void setAllowNullBody(boolean allowNullBody) {
-        this.allowNullBody = allowNullBody;
-    }
-
-    public boolean isMapJmsMessage() {
-        return mapJmsMessage;
-    }
-
-    /**
-     * Specifies whether Camel should auto map the received JMS message to a suited payload type, such as
-     * javax.jms.TextMessage to a String etc. See section about how mapping works below for more details.
-     */
-    public void setMapJmsMessage(boolean mapJmsMessage) {
-        this.mapJmsMessage = mapJmsMessage;
-    }
-
-    public MessageCreatedStrategy getMessageCreatedStrategy() {
-        return messageCreatedStrategy;
-    }
-
-    /**
-     * To use the given MessageCreatedStrategy which are invoked when Camel creates new instances of
-     * <tt>javax.jms.Message</tt> objects when Camel is sending a JMS message.
-     */
-    public void setMessageCreatedStrategy(MessageCreatedStrategy messageCreatedStrategy) {
-        this.messageCreatedStrategy = messageCreatedStrategy;
-    }
-
-    public JmsKeyFormatStrategy getJmsKeyFormatStrategy() {
-        if (jmsKeyFormatStrategy == null) {
-            jmsKeyFormatStrategy = new DefaultJmsKeyFormatStrategy();
-        }
-        return jmsKeyFormatStrategy;
-    }
-
-    /**
-     * 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.
-     */
-    public void setJmsKeyFormatStrategy(JmsKeyFormatStrategy jmsKeyFormatStrategy) {
-        this.jmsKeyFormatStrategy = jmsKeyFormatStrategy;
-    }
-
-    @Override
-    public HeaderFilterStrategy getHeaderFilterStrategy() {
-        if (headerFilterStrategy == null) {
-            headerFilterStrategy = new SjmsHeaderFilterStrategy(isIncludeAllJMSXProperties());
-        }
-        return headerFilterStrategy;
-    }
-
-    /**
-     * To use a custom HeaderFilterStrategy to filter header to and from Camel message.
-     */
-    @Override
-    public void setHeaderFilterStrategy(HeaderFilterStrategy strategy) {
-        this.headerFilterStrategy = strategy;
-    }
-
-    public boolean isIncludeAllJMSXProperties() {
-        return includeAllJMSXProperties;
-    }
-
-    /**
-     * 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.
-     */
-    public void setIncludeAllJMSXProperties(boolean includeAllJMSXProperties) {
-        this.includeAllJMSXProperties = includeAllJMSXProperties;
-    }
-
-    public ScheduledExecutorService getTimeoutCheckerExecutorService() {
-        return timeoutCheckerExecutorService;
-    }
-
-    /**
-     * If using the completionInterval option a background thread is created to trigger the completion interval. Set
-     * this option to provide a custom thread pool to be used rather than creating a new thread for every consumer.
-     */
-    public void setTimeoutCheckerExecutorService(ScheduledExecutorService timeoutCheckerExecutorService) {
-        this.timeoutCheckerExecutorService = timeoutCheckerExecutorService;
-    }
-
-    public boolean isAsyncStartListener() {
-        return asyncStartListener;
-    }
-
-    /**
-     * Whether to startup the consumer message listener asynchronously, when starting a route. For example if a
-     * JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover.
-     * This will cause Camel to block while starting routes. By setting this option to true, you will let routes
-     * startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this
-     * option is used, then beware that if the connection could not be established, then an exception is logged at WARN
-     * level, and the consumer will not be able to receive messages; You can then restart the route to retry.
-     */
-    public void setAsyncStartListener(boolean asyncStartListener) {
-        this.asyncStartListener = asyncStartListener;
-    }
-
-    public int getRecoveryInterval() {
-        return recoveryInterval;
-    }
-
-    /**
-     * Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The
-     * default is 5000 ms, that is, 5 seconds.
-     */
-    public void setRecoveryInterval(int recoveryInterval) {
-        this.recoveryInterval = recoveryInterval;
-    }
-
-    /**
-     * The delay in millis between attempts to re-establish a valid session. If this is a positive value the
-     * SjmsBatchConsumer will attempt to create a new session if it sees an Exception during message consumption. This
-     * delay value allows you to pause between attempts to prevent spamming the logs. If this is a negative value then
-     * the SjmsBatchConsumer will bail out and the consumer will not stop consuming new messages.
-     *
-     * The default is 5000 ms, that is, 5 seconds.
-     */
-    public void setKeepAliveDelay(int keepAliveDelay) {
-        this.keepAliveDelay = keepAliveDelay;
-    }
-
-    public int getKeepAliveDelay() {
-        return keepAliveDelay;
-    }
-
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResource.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResource.java
index cac22fe..043b708 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResource.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResource.java
@@ -27,6 +27,7 @@ import org.apache.commons.pool.impl.GenericObjectPool;
 /**
  * The default {@link ConnectionResource} implementation for the SJMSComponent.
  */
+@Deprecated
 public class ConnectionFactoryResource extends BasePoolableObjectFactory<Connection> implements ConnectionResource {
 
     private static final long DEFAULT_WAIT_TIMEOUT = 5 * 1000;
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionResource.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionResource.java
index 9041bff..9b63ef9 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionResource.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionResource.java
@@ -30,6 +30,7 @@ import javax.jms.ConnectionFactory;
  * {@link ConnectionFactoryResource) implementation that is provided with SJMS as it is optimized for this component.
  * </p>
  */
+@Deprecated
 public interface ConnectionResource {
 
     /**
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/DestinationNameParser.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/DestinationNameParser.java
index b37e87f..c3debab 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/DestinationNameParser.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/DestinationNameParser.java
@@ -28,13 +28,13 @@ public final class DestinationNameParser {
         return destinationName.startsWith("topic:");
     }
 
-    public static boolean isNamedReplyToTopic(String namedReplyTo, boolean isDestinationTopic) {
-        if (namedReplyTo == null) {
-            throw new IllegalArgumentException("namedReplyTo is null");
+    public static boolean isReplyToTopic(String replyTo, boolean isDestinationTopic) {
+        if (replyTo == null) {
+            throw new IllegalArgumentException("replyTo is null");
         }
-        if (namedReplyTo.startsWith("topic:")) {
+        if (replyTo.startsWith("topic:")) {
             return true;
-        } else if (namedReplyTo.startsWith("queue:")) {
+        } else if (replyTo.startsWith("queue:")) {
             return false;
         } else {
             return isDestinationTopic;
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/IllegalHeaderException.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/IllegalHeaderException.java
deleted file mode 100644
index 4cdfc3f..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/IllegalHeaderException.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.jms;
-
-import org.apache.camel.RuntimeCamelException;
-
-/**
- * IllegalHeaderException is thrown if a header is detected that doesn't meet the JMS standard.
- */
-public class IllegalHeaderException extends RuntimeCamelException {
-
-    private static final long serialVersionUID = 3136304415267471091L;
-
-    /**
-     */
-    public IllegalHeaderException() {
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public IllegalHeaderException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * @param message
-     */
-    public IllegalHeaderException(String message) {
-        super(message);
-    }
-
-    /**
-     * @param cause
-     */
-    public IllegalHeaderException(Throwable cause) {
-        super(cause);
-    }
-
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java
index 4974a1c..4e7c4fb 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java
@@ -93,10 +93,21 @@ public class Jms11ObjectFactory implements JmsObjectFactory {
     public MessageProducer createMessageProducer(Session session, Endpoint endpoint)
             throws Exception {
         SjmsEndpoint sjmsEndpoint = (SjmsEndpoint) endpoint;
+        return createMessageProducer(session, endpoint, sjmsEndpoint.getDestinationName());
+    }
+
+    @Override
+    public MessageProducer createMessageProducer(Session session, Endpoint endpoint, String destinationName) throws Exception {
+        SjmsEndpoint sjmsEndpoint = (SjmsEndpoint) endpoint;
         Destination destination = sjmsEndpoint.getDestinationCreationStrategy().createDestination(session,
-                sjmsEndpoint.getDestinationName(), sjmsEndpoint.isTopic());
+                destinationName, sjmsEndpoint.isTopic());
+
+        boolean persistent = sjmsEndpoint.isDeliveryPersistent();
+        if (sjmsEndpoint.getDeliveryMode() != null) {
+            persistent = DeliveryMode.PERSISTENT == sjmsEndpoint.getDeliveryMode();
+        }
 
-        return createMessageProducer(session, destination, sjmsEndpoint.isPersistent(), sjmsEndpoint.getTtl());
+        return createMessageProducer(session, destination, persistent, sjmsEndpoint.getTimeToLive());
     }
 
     @Override
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsObjectFactory.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsObjectFactory.java
index c6c4bc7..ab4b56f 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsObjectFactory.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsObjectFactory.java
@@ -40,6 +40,8 @@ public interface JmsObjectFactory {
 
     MessageProducer createMessageProducer(Session session, Endpoint endpoint) throws Exception;
 
+    MessageProducer createMessageProducer(Session session, Endpoint endpoint, String destinationName) throws Exception;
+
     MessageProducer createMessageProducer(
             Session session, Destination destination,
             boolean persistent, long ttl)
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
index 42d5fb3..e1b23d1 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
@@ -22,20 +22,25 @@ import javax.jms.Message;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
-import org.apache.camel.component.sjms.MessageProducerResources;
 import org.apache.camel.component.sjms.SjmsProducer;
 import org.apache.camel.component.sjms.TransactionCommitStrategy;
+import org.apache.camel.component.sjms.jms.JmsMessageHelper;
 import org.apache.camel.component.sjms.tx.DefaultTransactionCommitStrategy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.component.sjms.jms.JmsMessageHelper.isTopicPrefix;
 
 /**
  * A Camel Producer that provides the InOnly Exchange pattern.
  */
 public class InOnlyProducer extends SjmsProducer {
 
+    private static final Logger LOG = LoggerFactory.getLogger(InOnlyProducer.class);
+
     public InOnlyProducer(final Endpoint endpoint) {
         super(endpoint);
     }
@@ -49,45 +54,91 @@ public class InOnlyProducer extends SjmsProducer {
     }
 
     @Override
-    public void sendMessage(
-            final Exchange exchange, final AsyncCallback callback, final MessageProducerResources producer,
-            final ReleaseProducerCallback releaseProducerCallback) {
+    protected void sendMessage(Exchange exchange, Session session, String destinationName) {
         try {
-            Message message = getEndpoint().getBinding().makeJmsMessage(exchange, producer.getSession());
-            producer.getMessageProducer().send(message);
-        } catch (Exception e) {
-            exchange.setException(new CamelExchangeException("Unable to complete sending the JMS message", exchange, e));
-        } finally {
-            releaseProducerCallback.release(producer);
-            callback.done(isSynchronous());
-        }
-    }
+            template.execute(session, sc -> {
+                MessageProducer producer = null;
+                try {
+                    Message answer = getEndpoint().getBinding().makeJmsMessage(exchange, sc);
 
-    @Override
-    public void sendMessage(Exchange exchange, AsyncCallback callback, Session session, String destinationName) {
-        MessageProducer producer = null;
-        try {
-            Destination destination = resolveDestinationName(session, destinationName);
-            Message message = getEndpoint().getBinding().makeJmsMessage(exchange, session);
-            producer = session.createProducer(destination);
-            producer.send(message);
+                    // when in InOnly mode the JMSReplyTo is a bit complicated
+                    // we only want to set the JMSReplyTo on the answer if
+                    // there is a JMSReplyTo from the header/endpoint and
+                    // we have been told to preserveMessageQos
+
+                    Object jmsReplyTo = JmsMessageHelper.getJMSReplyTo(answer);
+                    if (getEndpoint().isDisableReplyTo()) {
+                        // honor disable reply to configuration
+                        LOG.trace("ReplyTo is disabled on endpoint: {}", getEndpoint());
+                        JmsMessageHelper.setJMSReplyTo(answer, null);
+                    } else {
+                        // if the binding did not create the reply to then we have to try to create it here
+                        if (jmsReplyTo == null) {
+                            // prefer reply to from header over endpoint configured
+                            jmsReplyTo = exchange.getIn().getHeader("JMSReplyTo", String.class);
+                            if (jmsReplyTo == null) {
+                                jmsReplyTo = getEndpoint().getReplyTo();
+                            }
+                        }
+                    }
+
+                    // we must honor these special flags to preserve QoS
+                    // as we are not OUT capable and thus do not expect a reply, and therefore
+                    // the consumer of this message should not return a reply so we remove it
+                    // unless we use preserveMessageQos=true to tell that we still want to use JMSReplyTo
+                    if (jmsReplyTo != null && !(getEndpoint().isPreserveMessageQos() || getEndpoint().isExplicitQosEnabled())) {
+                        // log at debug what we are doing, as higher level may cause noise in production logs
+                        // this behavior is also documented at the camel website
+                        if (LOG.isDebugEnabled()) {
+                            LOG.debug(
+                                    "Disabling JMSReplyTo: {} for destination: {}. Use preserveMessageQos=true to force Camel to keep the JMSReplyTo on endpoint: {}",
+                                    new Object[] { jmsReplyTo, destinationName, getEndpoint() });
+                        }
+                        jmsReplyTo = null;
+                    }
+
+                    // the reply to is a String, so we need to look up its Destination instance
+                    // and if needed create the destination using the session if needed to
+                    if (jmsReplyTo instanceof String) {
+                        String replyTo = (String) jmsReplyTo;
+                        // we need to null it as we use the String to resolve it as a Destination instance
+                        jmsReplyTo = resolveOrCreateDestination(replyTo, sc);
+                    }
+
+                    // set the JMSReplyTo on the answer if we are to use it
+                    Destination replyTo = null;
+                    String replyToOverride = getEndpoint().getReplyToOverride();
+                    if (replyToOverride != null) {
+                        replyTo = resolveOrCreateDestination(replyToOverride, sc);
+                    } else if (jmsReplyTo instanceof Destination) {
+                        replyTo = (Destination) jmsReplyTo;
+                    }
+                    if (replyTo != null) {
+                        LOG.debug("Using JMSReplyTo destination: {}", replyTo);
+                        JmsMessageHelper.setJMSReplyTo(answer, replyTo);
+                    } else {
+                        // do not use JMSReplyTo
+                        LOG.trace("Not using JMSReplyTo");
+                        JmsMessageHelper.setJMSReplyTo(answer, null);
+                    }
+
+                    producer = getEndpoint().getJmsObjectFactory().createMessageProducer(sc, getEndpoint(), destinationName);
+                    template.send(producer, answer);
+                } finally {
+                    close(producer);
+                }
+                return null;
+            });
         } catch (Exception e) {
             exchange.setException(new CamelExchangeException("Unable to complete sending the JMS message", exchange, e));
-        } finally {
-            try {
-                if (producer != null) {
-                    producer.close();
-                }
-            } catch (Throwable e) {
-                // ignore
-            }
-            callback.done(isSynchronous());
         }
     }
 
-    protected Destination resolveDestinationName(Session session, String destinationName) throws JMSException {
-        return getEndpoint().getDestinationCreationStrategy().createDestination(session,
-                destinationName, getEndpoint().isTopic());
+    protected Destination resolveOrCreateDestination(String destinationName, Session session)
+            throws JMSException {
+        boolean isPubSub = isTopicPrefix(destinationName)
+                || (!JmsMessageHelper.isQueuePrefix(destinationName) && getEndpoint().isTopic());
+        return getEndpoint().getDestinationCreationStrategy().createDestination(session, destinationName, isPubSub);
     }
 
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
index 6940ba5..5fadf0d 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Exchanger;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 import javax.jms.Connection;
 import javax.jms.Destination;
@@ -31,12 +30,11 @@ import javax.jms.MessageListener;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelException;
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
 import org.apache.camel.component.sjms.MessageConsumerResources;
-import org.apache.camel.component.sjms.MessageProducerResources;
+import org.apache.camel.component.sjms.SjmsConstants;
 import org.apache.camel.component.sjms.SjmsEndpoint;
 import org.apache.camel.component.sjms.SjmsMessage;
 import org.apache.camel.component.sjms.SjmsProducer;
@@ -76,9 +74,19 @@ public class InOutProducer extends SjmsProducer {
         this.uuidGenerator = uuidGenerator;
     }
 
+    @Deprecated
+    protected ConnectionResource getOrCreateConnectionResource() {
+        ConnectionResource answer = getEndpoint().getConnectionResource();
+        if (answer == null) {
+            answer = getEndpoint().createConnectionResource(this);
+        }
+        return answer;
+    }
+
     /**
      * A pool of {@link MessageConsumerResources} objects that are the reply consumers.
      */
+    @Deprecated
     protected class MessageConsumerResourcesFactory extends BasePoolableObjectFactory<MessageConsumerResources> {
 
         @Override
@@ -96,14 +104,14 @@ public class InOutProducer extends SjmsProducer {
 
                 Destination replyToDestination;
                 boolean isReplyToTopic;
-                if (ObjectHelper.isEmpty(getNamedReplyTo())) {
+                if (ObjectHelper.isEmpty(getReplyTo())) {
                     isReplyToTopic = isTopic();
                     replyToDestination = getEndpoint().getDestinationCreationStrategy().createTemporaryDestination(session,
                             isReplyToTopic);
                 } else {
-                    isReplyToTopic = DestinationNameParser.isNamedReplyToTopic(getNamedReplyTo(), isTopic());
+                    isReplyToTopic = DestinationNameParser.isReplyToTopic(getReplyTo(), isTopic());
                     replyToDestination = getEndpoint().getDestinationCreationStrategy().createDestination(session,
-                            getNamedReplyTo(), isReplyToTopic);
+                            getReplyTo(), isReplyToTopic);
                 }
                 MessageConsumer messageConsumer = getEndpoint().getJmsObjectFactory().createMessageConsumer(session,
                         replyToDestination, null, isReplyToTopic, null, true, false, false);
@@ -116,7 +124,7 @@ public class InOutProducer extends SjmsProducer {
                             String correlationID = message.getJMSCorrelationID();
                             Exchanger<Object> exchanger = EXCHANGERS.get(correlationID);
                             if (exchanger != null) {
-                                exchanger.exchange(message, getResponseTimeOut(), TimeUnit.MILLISECONDS);
+                                exchanger.exchange(message, getEndpoint().getRequestTimeout(), TimeUnit.MILLISECONDS);
                             } else {
                                 // we could not correlate the received reply message to a matching request and therefore
                                 // we cannot continue routing the unknown message
@@ -177,10 +185,10 @@ public class InOutProducer extends SjmsProducer {
                     "InOut exchange pattern is incompatible with transacted=true as it cause a deadlock. Please use transacted=false or InOnly exchange pattern.");
         }
 
-        if (ObjectHelper.isEmpty(getNamedReplyTo())) {
+        if (ObjectHelper.isEmpty(getReplyTo())) {
             LOG.debug("No reply to destination is defined. Using temporary destinations.");
         } else {
-            LOG.debug("Using {} as the reply to destination.", getNamedReplyTo());
+            LOG.debug("Using {} as the reply to destination.", getReplyTo());
         }
         if (uuidGenerator == null) {
             // use the generator configured on the camel context
@@ -212,139 +220,68 @@ public class InOutProducer extends SjmsProducer {
     }
 
     @Override
-    public void sendMessage(Exchange exchange, AsyncCallback callback, Session session, String destinationName) {
-        MessageProducer producer = null;
+    protected void sendMessage(Exchange exchange, Session session, String destinationName) {
         try {
-            Destination destination = resolveDestinationName(session, destinationName);
-            Message request = getEndpoint().getBinding().makeJmsMessage(exchange, session);
-
-            String correlationId = exchange.getIn().getHeader(JmsConstants.JMS_CORRELATION_ID, String.class);
-            if (correlationId == null) {
-                // we append the 'Camel-' prefix to know it was generated by us
-                correlationId = GENERATED_CORRELATION_ID_PREFIX + getUuidGenerator().generateUuid();
-            }
-
-            Object responseObject = null;
-            Exchanger<Object> messageExchanger = new Exchanger<>();
-            JmsMessageHelper.setCorrelationId(request, correlationId);
-            EXCHANGERS.put(correlationId, messageExchanger);
-
-            MessageConsumerResources consumer = consumers.borrowObject();
-            JmsMessageHelper.setJMSReplyTo(request, consumer.getReplyToDestination());
-            consumers.returnObject(consumer);
-
-            producer = session.createProducer(destination);
-            producer.send(request);
-
-            try {
-                responseObject = messageExchanger.exchange(null, getResponseTimeOut(), TimeUnit.MILLISECONDS);
-                EXCHANGERS.remove(correlationId);
-            } catch (InterruptedException e) {
-                LOG.debug("Exchanger was interrupted while waiting on response", e);
-                exchange.setException(e);
-            } catch (TimeoutException e) {
-                LOG.debug("Exchanger timed out while waiting on response", e);
-                exchange.setException(e);
-            }
-
-            if (exchange.getException() == null) {
-                if (responseObject instanceof Throwable) {
-                    exchange.setException((Throwable) responseObject);
-                } else if (responseObject instanceof Message) {
-                    Message message = (Message) responseObject;
-
-                    SjmsMessage response
-                            = new SjmsMessage(exchange, message, consumer.getSession(), getEndpoint().getBinding());
-                    // the JmsBinding is designed to be "pull-based": it will populate the Camel message on demand
-                    // therefore, we link Exchange and OUT message before continuing, so that the JmsBinding has full access
-                    // to everything it may need, and can populate headers, properties, etc. accordingly (solves CAMEL-6218).
-                    exchange.setOut(response);
-                } else {
-                    exchange.setException(new CamelException("Unknown response type: " + responseObject));
-                }
-            }
-        } catch (Exception e) {
-            exchange.setException(new CamelExchangeException("Unable to complete sending the JMS message", exchange, e));
-        } finally {
-            try {
-                if (producer != null) {
-                    producer.close();
-                }
-            } catch (Throwable e) {
-                // ignore
-            }
-            callback.done(isSynchronous());
-        }
-    }
-
-    /**
-     * TODO time out is actually double as it waits for the producer and then waits for the response. Use an atomic long
-     * to manage the countdown
-     */
-    @Override
-    public void sendMessage(
-            final Exchange exchange, final AsyncCallback callback, final MessageProducerResources producer,
-            final ReleaseProducerCallback releaseProducerCallback) {
-        try {
-            Message request = getEndpoint().getBinding().makeJmsMessage(exchange, producer.getSession());
+            template.execute(session, sc -> {
+                MessageProducer producer = null;
+                try {
+                    Message request = getEndpoint().getBinding().makeJmsMessage(exchange, sc);
+
+                    String correlationId = exchange.getIn().getHeader(JmsConstants.JMS_CORRELATION_ID, String.class);
+                    if (correlationId == null) {
+                        // we append the 'Camel-' prefix to know it was generated by us
+                        correlationId = GENERATED_CORRELATION_ID_PREFIX + getUuidGenerator().generateUuid();
+                    }
 
-            String correlationId = exchange.getIn().getHeader(JmsConstants.JMS_CORRELATION_ID, String.class);
-            if (correlationId == null) {
-                // we append the 'Camel-' prefix to know it was generated by us
-                correlationId = GENERATED_CORRELATION_ID_PREFIX + getUuidGenerator().generateUuid();
-            }
+                    // the request timeout can be overruled by a header otherwise the endpoint configured value is used
+                    final long timeout
+                            = exchange.getIn().getHeader(SjmsConstants.JMS_REQUEST_TIMEOUT, getEndpoint().getRequestTimeout(),
+                                    long.class);
 
-            Object responseObject = null;
-            Exchanger<Object> messageExchanger = new Exchanger<>();
-            JmsMessageHelper.setCorrelationId(request, correlationId);
-            EXCHANGERS.put(correlationId, messageExchanger);
+                    Object responseObject = null;
+                    Exchanger<Object> messageExchanger = new Exchanger<>();
+                    JmsMessageHelper.setCorrelationId(request, correlationId);
+                    EXCHANGERS.put(correlationId, messageExchanger);
 
-            MessageConsumerResources consumer = consumers.borrowObject();
-            JmsMessageHelper.setJMSReplyTo(request, consumer.getReplyToDestination());
-            consumers.returnObject(consumer);
-            producer.getMessageProducer().send(request);
+                    MessageConsumerResources consumer = consumers.borrowObject();
+                    JmsMessageHelper.setJMSReplyTo(request, consumer.getReplyToDestination());
+                    consumers.returnObject(consumer);
 
-            // Return the producer to the pool so another waiting producer can move forward
-            // without waiting on us to complete the exchange
-            releaseProducerCallback.release(producer);
+                    producer = getEndpoint().getJmsObjectFactory().createMessageProducer(sc, getEndpoint(), destinationName);
+                    template.send(producer, request);
 
-            try {
-                responseObject = messageExchanger.exchange(null, getResponseTimeOut(), TimeUnit.MILLISECONDS);
-                EXCHANGERS.remove(correlationId);
-            } catch (InterruptedException e) {
-                LOG.debug("Exchanger was interrupted while waiting on response", e);
-                exchange.setException(e);
-            } catch (TimeoutException e) {
-                LOG.debug("Exchanger timed out while waiting on response", e);
-                exchange.setException(e);
-            }
+                    try {
+                        responseObject = messageExchanger.exchange(null, timeout, TimeUnit.MILLISECONDS);
+                        EXCHANGERS.remove(correlationId);
+                    } catch (Throwable e) {
+                        exchange.setException(e);
+                    }
 
-            if (exchange.getException() == null) {
-                if (responseObject instanceof Throwable) {
-                    exchange.setException((Throwable) responseObject);
-                } else if (responseObject instanceof Message) {
-                    Message message = (Message) responseObject;
+                    if (exchange.getException() == null) {
+                        if (responseObject instanceof Throwable) {
+                            exchange.setException((Throwable) responseObject);
+                        } else if (responseObject instanceof Message) {
+                            Message message = (Message) responseObject;
+
+                            SjmsMessage response
+                                    = new SjmsMessage(exchange, message, consumer.getSession(), getEndpoint().getBinding());
+                            // the JmsBinding is designed to be "pull-based": it will populate the Camel message on demand
+                            // therefore, we link Exchange and OUT message before continuing, so that the JmsBinding has full access
+                            // to everything it may need, and can populate headers, properties, etc. accordingly (solves CAMEL-6218).
+                            exchange.setOut(response);
+                        } else {
+                            exchange.setException(new CamelException("Unknown response type: " + responseObject));
+                        }
+                    }
 
-                    SjmsMessage response
-                            = new SjmsMessage(exchange, message, consumer.getSession(), getEndpoint().getBinding());
-                    // the JmsBinding is designed to be "pull-based": it will populate the Camel message on demand
-                    // therefore, we link Exchange and OUT message before continuing, so that the JmsBinding has full access
-                    // to everything it may need, and can populate headers, properties, etc. accordingly (solves CAMEL-6218).
-                    exchange.setOut(response);
-                } else {
-                    exchange.setException(new CamelException("Unknown response type: " + responseObject));
+                } finally {
+                    close(producer);
                 }
-            }
+                return null;
+            });
         } catch (Exception e) {
             exchange.setException(new CamelExchangeException("Unable to complete sending the JMS message", exchange, e));
-        } finally {
-            callback.done(isSynchronous());
         }
     }
 
-    protected Destination resolveDestinationName(Session session, String destinationName) throws JMSException {
-        return getEndpoint().getDestinationCreationStrategy().createDestination(session,
-                destinationName, getEndpoint().isTopic());
-    }
-
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/taskmanager/TimedTaskManager.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/taskmanager/TimedTaskManager.java
deleted file mode 100644
index 1072b7a..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/taskmanager/TimedTaskManager.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.taskmanager;
-
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-/**
- * A thread safe task manager that allows you to add and cancel {@link TimerTask} objects.
- */
-public class TimedTaskManager {
-
-    private final Timer timer = new Timer();
-    private final ReadWriteLock lock = new ReentrantReadWriteLock();
-
-    public TimedTaskManager() {
-    }
-
-    public void addTask(TimerTask task, long delay) {
-        try {
-            lock.writeLock().lock();
-            timer.schedule(task, delay);
-        } finally {
-            lock.writeLock().unlock();
-        }
-    }
-
-    public void cancelTasks() {
-        try {
-            lock.writeLock().lock();
-            timer.cancel();
-        } finally {
-            lock.writeLock().unlock();
-        }
-    }
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java
deleted file mode 100644
index 22fb61a..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.tx;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.component.sjms.TransactionCommitStrategy;
-
-/**
- * Provides a thread safe counter to track the number of {@link Exchange} objects that have been been processed.
- */
-@Deprecated
-public class BatchTransactionCommitStrategy implements TransactionCommitStrategy {
-
-    private final AtomicInteger current = new AtomicInteger();
-    private final int count;
-
-    public BatchTransactionCommitStrategy(int count) {
-        this.count = count;
-    }
-
-    @Override
-    public boolean commit(Exchange exchange) throws Exception {
-        boolean answer = false;
-        int currentVal = current.incrementAndGet();
-        if (currentVal >= count) {
-            answer = true;
-            current.set(0);
-        }
-
-        return answer;
-    }
-
-    @Override
-    public boolean rollback(Exchange exchange) throws Exception {
-        current.set(0);
-        return true;
-    }
-
-    public void reset() {
-        current.set(0);
-    }
-
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionBatchTransactionSynchronization.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionBatchTransactionSynchronization.java
deleted file mode 100644
index d36aa42..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionBatchTransactionSynchronization.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.tx;
-
-import java.util.TimerTask;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import javax.jms.Session;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.component.sjms.TransactionCommitStrategy;
-import org.apache.camel.component.sjms.taskmanager.TimedTaskManager;
-import org.apache.camel.spi.Synchronization;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * SessionTransactionSynchronization is called at the completion of each {@link org.apache.camel.Exchange}.
- */
-@Deprecated
-public class SessionBatchTransactionSynchronization implements Synchronization {
-    private static final Logger LOG = LoggerFactory.getLogger(SessionBatchTransactionSynchronization.class);
-    private Session session;
-    private final TransactionCommitStrategy commitStrategy;
-    private long batchTransactionTimeout = 5000;
-    private TimeoutTask currentTask;
-    private ReadWriteLock lock = new ReentrantReadWriteLock();
-    private final TimedTaskManager timedTaskManager;
-
-    public SessionBatchTransactionSynchronization(TimedTaskManager timedTaskManager,
-                                                  Session session, TransactionCommitStrategy commitStrategy,
-                                                  long batchTransactionTimeout) {
-        this.timedTaskManager = timedTaskManager;
-        this.session = session;
-        if (commitStrategy == null) {
-            this.commitStrategy = new DefaultTransactionCommitStrategy();
-        } else {
-            this.commitStrategy = commitStrategy;
-        }
-        if (batchTransactionTimeout > 0) {
-            this.batchTransactionTimeout = batchTransactionTimeout;
-            createTask();
-        }
-    }
-
-    @Override
-    public void onFailure(Exchange exchange) {
-        try {
-            lock.readLock().lock();
-            if (commitStrategy.rollback(exchange)) {
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("Processing failure of Exchange id:{}", exchange.getExchangeId());
-                }
-                if (session != null && session.getTransacted()) {
-                    session.rollback();
-                }
-            }
-        } catch (Exception e) {
-            LOG.warn("Failed to rollback the session: {}. This exception will be ignored.", e.getMessage(), e);
-        } finally {
-            lock.readLock().unlock();
-        }
-    }
-
-    @Override
-    public void onComplete(Exchange exchange) {
-        try {
-            lock.readLock().lock();
-            if (commitStrategy.commit(exchange)) {
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("Processing completion of Exchange id:{}", exchange.getExchangeId());
-                }
-                if (session != null && session.getTransacted()) {
-                    session.commit();
-                }
-            }
-        } catch (Exception e) {
-            LOG.warn("Failed to commit the session: {}. This exception will be ignored.", e.getMessage(), e);
-            exchange.setException(e);
-        } finally {
-            lock.readLock().unlock();
-        }
-        resetTask();
-    }
-
-    private void createTask() {
-        try {
-            lock.writeLock().lock();
-            currentTask = new TimeoutTask();
-        } finally {
-            lock.writeLock().unlock();
-        }
-    }
-
-    private void resetTask() {
-        try {
-            lock.writeLock().lock();
-            currentTask.cancel();
-            currentTask = new TimeoutTask();
-        } finally {
-            lock.writeLock().unlock();
-        }
-        timedTaskManager.addTask(currentTask, batchTransactionTimeout);
-    }
-
-    public final class TimeoutTask extends TimerTask {
-
-        private TimeoutTask() {
-        }
-
-        /**
-         * When the timer executes, either commits or rolls back the session transaction.
-         */
-        @Override
-        public void run() {
-            LOG.debug("Batch Transaction Timer expired");
-            try {
-                lock.writeLock().lock();
-                LOG.trace("Committing the current transactions");
-                try {
-                    if (session != null && session.getTransacted()) {
-                        session.commit();
-                    }
-                    ((BatchTransactionCommitStrategy) commitStrategy).reset();
-                } catch (Exception e) {
-                    LOG.warn("Failed to commit the session during timeout: {}. This exception will be ignored.",
-                            e.getMessage(), e);
-                }
-            } finally {
-                lock.writeLock().unlock();
-            }
-        }
-
-        @Override
-        public boolean cancel() {
-            LOG.trace("Cancelling the TimeoutTask");
-            return super.cancel();
-        }
-    }
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java
index 4a15f40..ae8e3e4 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.sjms.tx;
 
+import javax.jms.Connection;
 import javax.jms.Session;
 
 import org.apache.camel.Exchange;
@@ -32,11 +33,16 @@ import org.slf4j.LoggerFactory;
 public class SessionTransactionSynchronization extends SynchronizationAdapter {
     private static final Logger LOG = LoggerFactory.getLogger(SessionTransactionSynchronization.class);
 
+    private final Connection connection;
     private final Session session;
     private final TransactionCommitStrategy commitStrategy;
+    private final boolean close;
 
-    public SessionTransactionSynchronization(Session session, TransactionCommitStrategy commitStrategy) {
+    public SessionTransactionSynchronization(Connection connection, Session session, TransactionCommitStrategy commitStrategy,
+                                             boolean close) {
+        this.connection = connection;
         this.session = session;
+        this.close = close;
         if (commitStrategy == null) {
             this.commitStrategy = new DefaultTransactionCommitStrategy();
         } else {
@@ -56,6 +62,11 @@ public class SessionTransactionSynchronization extends SynchronizationAdapter {
         } catch (Exception e) {
             LOG.warn("Failed to rollback the JMS session: {}", e.getMessage());
         }
+
+        if (close) {
+            close(session);
+            close(connection);
+        }
     }
 
     @Override
@@ -71,6 +82,11 @@ public class SessionTransactionSynchronization extends SynchronizationAdapter {
             LOG.warn("Failed to commit the JMS session: {}", e.getMessage());
             exchange.setException(e);
         }
+
+        if (close) {
+            close(session);
+            close(connection);
+        }
     }
 
     @Override
@@ -78,4 +94,25 @@ public class SessionTransactionSynchronization extends SynchronizationAdapter {
         // must not handover as we should be synchronous
         return false;
     }
+
+    private static void close(Connection con) {
+        if (con != null) {
+            try {
+                con.close();
+            } catch (Throwable e) {
+                // ignore
+            }
+        }
+    }
+
+    private static void close(Session session) {
+        if (session != null) {
+            try {
+                session.close();
+            } catch (Throwable e) {
+                // ignore
+            }
+        }
+    }
+
 }
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java
index 5a6dbf6..f3ccfb4 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java
@@ -75,7 +75,7 @@ public class ReconnectInOutProducerTest extends JmsTestSupport {
             public void configure() {
                 from("direct:start")
                         .to("log:" + TEST_DESTINATION_NAME + ".in.log.1?showBody=true")
-                        .to(ExchangePattern.InOut, "sjms:queue:" + TEST_DESTINATION_NAME + ".request" + "?namedReplyTo="
+                        .to(ExchangePattern.InOut, "sjms:queue:" + TEST_DESTINATION_NAME + ".request" + "?replyTo="
                                                    + TEST_DESTINATION_NAME + ".response")
                         .to("log:" + TEST_DESTINATION_NAME + ".out.log.1?showBody=true");
             }
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
index 62f8a0a..5c0f2b6 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.sjms;
 
-import javax.jms.ConnectionFactory;
-
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
@@ -31,16 +29,17 @@ public class SjmsComponentRestartTest extends CamelTestSupport {
             = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
 
     @Override
+    protected boolean useJmx() {
+        return false;
+    }
+
+    @Override
     public boolean isUseRouteBuilder() {
         return false;
     }
 
     @Test
     public void testRestartWithStopStart() throws Exception {
-        SjmsComponent sjmsComponent = new SjmsComponent();
-        sjmsComponent.setConnectionFactory((ConnectionFactory) context.getRegistry().lookupByName("activemqCF"));
-        context.addComponent("sjms", sjmsComponent);
-
         RouteBuilder routeBuilder = new RouteBuilder(context) {
             @Override
             public void configure() throws Exception {
@@ -58,8 +57,7 @@ public class SjmsComponentRestartTest extends CamelTestSupport {
         // restart
         context.stop();
 
-        // must add our custom component back again
-        context.addComponent("sjms", sjmsComponent);
+        resetMocks();
 
         context.start();
 
@@ -75,10 +73,6 @@ public class SjmsComponentRestartTest extends CamelTestSupport {
 
     @Test
     public void testRestartWithSuspendResume() throws Exception {
-        SjmsComponent sjmsComponent = new SjmsComponent();
-        sjmsComponent.setConnectionFactory((ConnectionFactory) context.getRegistry().lookupByName("activemqCF"));
-        context.addComponent("sjms", sjmsComponent);
-
         RouteBuilder routeBuilder = new RouteBuilder(context) {
             @Override
             public void configure() throws Exception {
@@ -97,6 +91,8 @@ public class SjmsComponentRestartTest extends CamelTestSupport {
         context.suspend();
         context.resume();
 
+        resetMocks();
+
         getMockEndpoint("mock:test").expectedMessageCount(1);
 
         template.sendBody("sjms:queue:test", "Hello World");
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java
index 4ebb9db..460497c 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java
@@ -55,7 +55,7 @@ public class SjmsDestinationCreationStrategyTest extends JmsTestSupport {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("sjms:queue:inout?prefillPool=false&exchangePattern=InOut")
+                from("sjms:queue:inout?exchangePattern=InOut")
                         .process(exchange -> exchange.getMessage().setBody("response"));
             }
         };
@@ -64,11 +64,11 @@ public class SjmsDestinationCreationStrategyTest extends JmsTestSupport {
     @Test
     public void testSjmsComponentUsesCustomDestinationCreationStrategy() throws Exception {
         assertFalse(createDestinationCalled);
-        template.sendBody("sjms:queue:inonly?prefillPool=false", "hello world");
+        template.sendBody("sjms:queue:inonly", "hello world");
         assertTrue(createDestinationCalled);
 
         assertFalse(createTemporaryDestination);
-        String response = (String) template.sendBody("sjms:queue:inout?prefillPool=false&exchangePattern=InOut",
+        String response = (String) template.sendBody("sjms:queue:inout?exchangePattern=InOut",
                 ExchangePattern.InOut, "hello world 2");
         assertTrue(createTemporaryDestination);
         assertEquals("response", response);
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
index e7f1951..723226f 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
@@ -83,13 +83,13 @@ public class SjmsEndpointTest extends CamelTestSupport {
     }
 
     @Test
-    public void testNamedReplyTo() throws Exception {
-        String namedReplyTo = "reply.to.queue";
-        Endpoint endpoint = context.getEndpoint("sjms:queue:test?namedReplyTo=" + namedReplyTo);
+    public void testReplyTo() throws Exception {
+        String replyTo = "reply.to.queue";
+        Endpoint endpoint = context.getEndpoint("sjms:queue:test?replyTo=" + replyTo);
         assertNotNull(endpoint);
         assertTrue(endpoint instanceof SjmsEndpoint);
         SjmsEndpoint qe = (SjmsEndpoint) endpoint;
-        assertEquals(qe.getNamedReplyTo(), namedReplyTo);
+        assertEquals(qe.getReplyTo(), replyTo);
         assertEquals(qe.createExchange().getPattern(), ExchangePattern.InOut);
     }
 
@@ -134,25 +134,18 @@ public class SjmsEndpointTest extends CamelTestSupport {
     }
 
     @Test
-    public void testNamedReplyToAndMEPMatch() throws Exception {
-        String namedReplyTo = "reply.to.queue";
+    public void testReplyToAndMEPMatch() throws Exception {
+        String replyTo = "reply.to.queue";
         Endpoint endpoint = context
-                .getEndpoint("sjms:queue:test?namedReplyTo=" + namedReplyTo + "&exchangePattern=" + ExchangePattern.InOut);
+                .getEndpoint("sjms:queue:test?replyTo=" + replyTo + "&exchangePattern=" + ExchangePattern.InOut);
         assertNotNull(endpoint);
         assertTrue(endpoint instanceof SjmsEndpoint);
         SjmsEndpoint qe = (SjmsEndpoint) endpoint;
-        assertEquals(qe.getNamedReplyTo(), namedReplyTo);
+        assertEquals(qe.getReplyTo(), replyTo);
         assertEquals(qe.createExchange().getPattern(), ExchangePattern.InOut);
     }
 
     @Test
-    public void testNamedReplyToAndMEPMismatch() throws Exception {
-        assertThrows(Exception.class,
-                () -> context
-                        .getEndpoint("sjms:queue:test?namedReplyTo=reply.to.queue&exchangePattern=" + ExchangePattern.InOnly));
-    }
-
-    @Test
     public void testDestinationName() throws Exception {
         Endpoint endpoint = context.getEndpoint("sjms:queue:test?synchronous=true");
         assertNotNull(endpoint);
@@ -161,42 +154,6 @@ public class SjmsEndpointTest extends CamelTestSupport {
         assertTrue(qe.isSynchronous());
     }
 
-    @Test
-    public void testTransactedBatchCountDefault() throws Exception {
-        Endpoint endpoint = context.getEndpoint("sjms:queue:test?transacted=true");
-        assertNotNull(endpoint);
-        assertTrue(endpoint instanceof SjmsEndpoint);
-        SjmsEndpoint qe = (SjmsEndpoint) endpoint;
-        assertEquals(-1, qe.getTransactionBatchCount());
-    }
-
-    @Test
-    public void testTransactedBatchCountModified() throws Exception {
-        Endpoint endpoint = context.getEndpoint("sjms:queue:test?transacted=true&transactionBatchCount=10");
-        assertNotNull(endpoint);
-        assertTrue(endpoint instanceof SjmsEndpoint);
-        SjmsEndpoint qe = (SjmsEndpoint) endpoint;
-        assertEquals(10, qe.getTransactionBatchCount());
-    }
-
-    @Test
-    public void testTransactedBatchTimeoutDefault() throws Exception {
-        Endpoint endpoint = context.getEndpoint("sjms:queue:test?transacted=true");
-        assertNotNull(endpoint);
-        assertTrue(endpoint instanceof SjmsEndpoint);
-        SjmsEndpoint qe = (SjmsEndpoint) endpoint;
-        assertEquals(5000, qe.getTransactionBatchTimeout());
-    }
-
-    @Test
-    public void testTransactedBatchTimeoutModified() throws Exception {
-        Endpoint endpoint = context.getEndpoint("sjms:queue:test?transacted=true&transactionBatchTimeout=3000");
-        assertNotNull(endpoint);
-        assertTrue(endpoint instanceof SjmsEndpoint);
-        SjmsEndpoint qe = (SjmsEndpoint) endpoint;
-        assertEquals(3000, qe.getTransactionBatchTimeout());
-    }
-
     @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/EmbeddedActiveMQBroker.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/EmbeddedActiveMQBroker.java
deleted file mode 100644
index f001384..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/EmbeddedActiveMQBroker.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.batch;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
-import org.apache.camel.test.AvailablePortFinder;
-import org.junit.jupiter.api.extension.AfterEachCallback;
-import org.junit.jupiter.api.extension.BeforeEachCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * JUnit Test aspect that creates an embedded ActiveMQ broker at the beginning of each test and shuts it down after.
- */
-public class EmbeddedActiveMQBroker implements BeforeEachCallback, AfterEachCallback {
-
-    private final Logger log = LoggerFactory.getLogger(EmbeddedActiveMQBroker.class);
-    private final String brokerId;
-    private BrokerService brokerService;
-    private final String tcpConnectorUri;
-
-    public EmbeddedActiveMQBroker(String brokerId) {
-        if ((brokerId == null) || (brokerId.isEmpty())) {
-            throw new IllegalArgumentException("brokerId is empty");
-        }
-        this.brokerId = brokerId;
-        tcpConnectorUri = "tcp://localhost:" + AvailablePortFinder.getNextAvailable();
-
-        brokerService = new BrokerService();
-        brokerService.setBrokerId(brokerId);
-        brokerService.setPersistent(false);
-        brokerService.setUseJmx(false);
-        try {
-            brokerService.setPersistenceAdapter(new MemoryPersistenceAdapter());
-            brokerService.addConnector(tcpConnectorUri);
-        } catch (Exception e) {
-            throw new RuntimeException("Problem creating brokerService", e);
-        }
-    }
-
-    @Override
-    public void beforeEach(ExtensionContext context) throws Exception {
-        log.info("Starting embedded broker[{}] on {}", brokerId, tcpConnectorUri);
-        brokerService.start();
-    }
-
-    @Override
-    public void afterEach(ExtensionContext context) throws Exception {
-        try {
-            log.info("Stopping embedded broker[{}]", brokerId);
-            brokerService.stop();
-        } catch (Exception e) {
-            throw new RuntimeException("Exception shutting down broker service", e);
-        }
-    }
-
-    public String getTcpConnectorUri() {
-        return tcpConnectorUri;
-    }
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerAsyncStartTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerAsyncStartTest.java
deleted file mode 100644
index 6abb477..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerAsyncStartTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.batch;
-
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.component.sjms.SjmsComponent;
-import org.apache.camel.component.sjms.support.MockConnectionFactory;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.SimpleRegistry;
-
-public class SjmsBatchConsumerAsyncStartTest extends SjmsBatchConsumerTest {
-
-    // lets just test that any of the existing tests works
-
-    @Override
-    public CamelContext createCamelContext() throws Exception {
-        SimpleRegistry registry = new SimpleRegistry();
-        registry.bind("testStrategy", new ListAggregationStrategy());
-        ConnectionFactory connectionFactory = new MockConnectionFactory(broker.getTcpConnectorUri());
-
-        SjmsComponent sjmsComponent = new SjmsComponent();
-        sjmsComponent.setConnectionFactory(connectionFactory);
-
-        SjmsBatchComponent sjmsBatchComponent = new SjmsBatchComponent();
-        sjmsBatchComponent.setConnectionFactory(connectionFactory);
-        // turn on async start listener
-        sjmsBatchComponent.setAsyncStartListener(true);
-
-        CamelContext context = new DefaultCamelContext(registry);
-        context.addComponent("sjms", sjmsComponent);
-        context.addComponent("sjms-batch", sjmsBatchComponent);
-        return context;
-    }
-
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerTest.java
deleted file mode 100644
index 9ebe6b2..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerTest.java
+++ /dev/null
@@ -1,508 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.batch;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
-import org.apache.camel.LoggingLevel;
-import org.apache.camel.Message;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.AggregationStrategies;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.sjms.SjmsComponent;
-import org.apache.camel.component.sjms.support.MockConnectionFactory;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.apache.camel.util.StopWatch;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class SjmsBatchConsumerTest extends CamelTestSupport {
-    private static final Logger LOG = LoggerFactory.getLogger(SjmsBatchConsumerTest.class);
-
-    @RegisterExtension
-    public EmbeddedActiveMQBroker broker = new EmbeddedActiveMQBroker("localhost");
-
-    @Override
-    public CamelContext createCamelContext() throws Exception {
-        SimpleRegistry registry = new SimpleRegistry();
-        registry.bind("testStrategy", new ListAggregationStrategy());
-        // the only thing special about this MockConnectionFactor is it allows us to call returnBadSessionNTimes(int)
-        // which will cause the MockSession to throw an IllegalStateException <int> times before returning a valid one.
-        // This gives us the ability to test bad sessions
-        ConnectionFactory connectionFactory = new MockConnectionFactory(broker.getTcpConnectorUri());
-
-        SjmsComponent sjmsComponent = new SjmsComponent();
-        sjmsComponent.setConnectionFactory(connectionFactory);
-
-        SjmsBatchComponent sjmsBatchComponent = new SjmsBatchComponent();
-        sjmsBatchComponent.setConnectionFactory(connectionFactory);
-
-        CamelContext context = new DefaultCamelContext(registry);
-        context.addComponent("sjms", sjmsComponent);
-        context.addComponent("sjms-batch", sjmsBatchComponent);
-        return context;
-    }
-
-    private static class TransactedSendHarness extends RouteBuilder {
-        private final String queueName;
-
-        TransactedSendHarness(String queueName) {
-            this.queueName = queueName;
-        }
-
-        @Override
-        public void configure() throws Exception {
-            from("direct:in").routeId("harness").startupOrder(20)
-                    .split(body())
-                    .toF("sjms:queue:%s?transacted=true", queueName)
-                    .to("mock:before")
-                    .end();
-        }
-    }
-
-    @Override
-    public boolean isUseAdviceWith() {
-        return true;
-    }
-
-    @Test
-    public void testConsumption() throws Exception {
-
-        final int messageCount = 10000;
-        final int consumerCount = 5;
-
-        final String queueName = getQueueName();
-        context.addRoutes(new TransactedSendHarness(queueName));
-        context.addRoutes(new RouteBuilder() {
-            public void configure() throws Exception {
-
-                int completionTimeout = 1000;
-                int completionSize = 200;
-
-                fromF("sjms-batch:%s?completionTimeout=%s&completionSize=%s&consumerCount=%s&aggregationStrategy=#testStrategy",
-                        queueName, completionTimeout, completionSize, consumerCount)
-                                .routeId("batchConsumer").startupOrder(10).autoStartup(false)
-                                .split(body())
-                                .to("mock:split");
-            }
-        });
-        context.start();
-
-        MockEndpoint mockBefore = getMockEndpoint("mock:before");
-        mockBefore.setExpectedMessageCount(messageCount);
-
-        MockEndpoint mockSplit = getMockEndpoint("mock:split");
-        mockSplit.setExpectedMessageCount(messageCount);
-
-        LOG.info("Sending messages");
-        template.sendBody("direct:in", generateStrings(messageCount));
-        LOG.info("Send complete");
-
-        StopWatch stopWatch = new StopWatch();
-        context.getRouteController().startRoute("batchConsumer");
-        assertMockEndpointsSatisfied();
-        long time = stopWatch.taken();
-
-        LOG.info("Processed {} messages in {} ms", messageCount, time);
-        LOG.info("Average throughput {} msg/s", (long) (messageCount / (time / 1000d)));
-    }
-
-    @Test
-    public void testConsumptionCompletionSize() throws Exception {
-        final int completionSize = 5;
-        final int completionTimeout = -1; // size-based only
-
-        final String queueName = getQueueName();
-        context.addRoutes(new TransactedSendHarness(queueName));
-        context.addRoutes(new RouteBuilder() {
-            public void configure() throws Exception {
-                fromF("sjms-batch:%s?completionTimeout=%s&completionSize=%s&aggregationStrategy=#testStrategy",
-                        queueName, completionTimeout, completionSize).routeId("batchConsumer").startupOrder(10)
-                                .log(LoggingLevel.DEBUG, "${body.size}")
-                                .to("mock:batches");
-            }
-        });
-        context.start();
-
-        int messageCount = 100;
-        MockEndpoint mockBatches = getMockEndpoint("mock:batches");
-        mockBatches.expectedMessageCount(messageCount / completionSize);
-
-        template.sendBody("direct:in", generateStrings(messageCount));
-        mockBatches.assertIsSatisfied();
-
-        Message msg = mockBatches.getExchanges().get(0).getMessage();
-        assertEquals("size", msg.getExchange().getProperty(Exchange.AGGREGATED_COMPLETED_BY));
-    }
-
-    @Test
-    public void testConsumptionCompletionPredicate() throws Exception {
-        final String completionPredicate = "${body} contains 'done'";
-        final int completionTimeout = -1; // predicate-based only
-
-        final String queueName = getQueueName();
-        context.addRoutes(new TransactedSendHarness(queueName));
-        context.addRoutes(new RouteBuilder() {
-            public void configure() throws Exception {
-                fromF("sjms-batch:%s?completionTimeout=%s&completionPredicate=%s&aggregationStrategy=#testStrategy&eagerCheckCompletion=true",
-                        queueName, completionTimeout, completionPredicate).routeId("batchConsumer").startupOrder(10)
-                                .log(LoggingLevel.DEBUG, "${body.size}")
-                                .to("mock:batches");
-            }
-        });
-        context.start();
-
-        MockEndpoint mockBatches = getMockEndpoint("mock:batches");
-        mockBatches.expectedMessageCount(2);
-
-        template.sendBody("direct:in", generateStrings(50));
-        template.sendBody("direct:in", "Message done");
-        template.sendBody("direct:in", generateStrings(50));
-        template.sendBody("direct:in", "Message done");
-        mockBatches.assertIsSatisfied();
-
-        Message msg = mockBatches.getExchanges().get(0).getMessage();
-        assertEquals("predicate", msg.getExchange().getProperty(Exchange.AGGREGATED_COMPLETED_BY));
-    }
-
-    @Test
-    public void testConsumptionCompletionTimeout() throws Exception {
-        final int completionTimeout = 2000;
-        final int completionSize = -1; // timeout-based only
-
-        final String queueName = getQueueName();
-        context.addRoutes(new TransactedSendHarness(queueName));
-        context.addRoutes(new RouteBuilder() {
-            public void configure() throws Exception {
-                fromF("sjms-batch:%s?completionTimeout=%s&completionSize=%s&aggregationStrategy=#testStrategy",
-                        queueName, completionTimeout, completionSize).routeId("batchConsumer").startupOrder(10)
-                                .to("mock:batches");
-            }
-        });
-        context.start();
-
-        int messageCount = 50;
-        assertTrue(messageCount < SjmsBatchEndpoint.DEFAULT_COMPLETION_SIZE);
-        MockEndpoint mockBatches = getMockEndpoint("mock:batches");
-        mockBatches.expectedMessageCount(1);  // everything batched together
-
-        template.sendBody("direct:in", generateStrings(messageCount));
-        mockBatches.assertIsSatisfied();
-        assertFirstMessageBodyOfLength(mockBatches, messageCount);
-
-        Message msg = mockBatches.getExchanges().get(0).getMessage();
-        assertEquals("timeout", msg.getExchange().getProperty(Exchange.AGGREGATED_COMPLETED_BY));
-    }
-
-    @Test
-    public void testConsumptionCompletionInterval() throws Exception {
-        final int completionInterval = 2000;
-        final int completionSize = -1; // timeout-based only
-
-        final String queueName = getQueueName();
-        context.addRoutes(new TransactedSendHarness(queueName));
-        context.addRoutes(new RouteBuilder() {
-            public void configure() throws Exception {
-                fromF("sjms-batch:%s?completionInterval=%s&completionSize=%s&aggregationStrategy=#testStrategy",
-                        queueName, completionInterval, completionSize).routeId("batchConsumer").startupOrder(10)
-                                .to("mock:batches");
-            }
-        });
-        context.start();
-
-        int messageCount = 50;
-        assertTrue(messageCount < SjmsBatchEndpoint.DEFAULT_COMPLETION_SIZE);
-
-        MockEndpoint mockBatches = getMockEndpoint("mock:batches");
-        mockBatches.expectedMinimumMessageCount(1);  // everything ought to be batched together but the interval may trigger in between and we get 2 etc
-
-        template.sendBody("direct:in", generateStrings(messageCount));
-
-        mockBatches.assertIsSatisfied();
-
-        Message msg = mockBatches.getExchanges().get(0).getMessage();
-        assertEquals("interval", msg.getExchange().getProperty(Exchange.AGGREGATED_COMPLETED_BY));
-    }
-
-    @Test
-    public void testConsumptionSendEmptyMessageWhenIdle() throws Exception {
-        final int completionInterval = 2000;
-        final int completionSize = -1; // timeout-based only
-
-        final String queueName = getQueueName();
-        context.addRoutes(new TransactedSendHarness(queueName));
-        context.addRoutes(new RouteBuilder() {
-            public void configure() throws Exception {
-                fromF("sjms-batch:%s?completionInterval=%s&completionSize=%s&sendEmptyMessageWhenIdle=true&aggregationStrategy=#testStrategy",
-                        queueName, completionInterval, completionSize).routeId("batchConsumer").startupOrder(10)
-                                .to("mock:batches");
-            }
-        });
-        context.start();
-
-        int messageCount = 50;
-        assertTrue(messageCount < SjmsBatchEndpoint.DEFAULT_COMPLETION_SIZE);
-
-        MockEndpoint mockBatches = getMockEndpoint("mock:batches");
-        // trigger a couple of empty messages
-        mockBatches.expectedMinimumMessageCount(3);
-
-        template.sendBody("direct:in", generateStrings(messageCount));
-
-        mockBatches.assertIsSatisfied();
-    }
-
-    /**
-     * Checks whether multiple consumer endpoints can operate in parallel.
-     */
-    @Test
-    public void testConsumptionMultipleConsumerEndpoints() throws Exception {
-        final int completionTimeout = 2000;
-        final int completionSize = 5;
-
-        final String queueName = getQueueName();
-        context.addRoutes(new RouteBuilder() {
-            public void configure() throws Exception {
-
-                from("direct:in")
-                        .split().body()
-                        .multicast()
-                        .toF("sjms:%s", queueName + "A")
-                        .toF("sjms:%s", queueName + "B")
-                        .end();
-
-                fromF("sjms-batch:%s?completionTimeout=%s&completionSize=%s&aggregationStrategy=#testStrategy",
-                        queueName + "A", completionTimeout, completionSize).routeId("batchConsumerA")
-                                .to("mock:outA");
-
-                fromF("sjms-batch:%s?completionTimeout=%s&completionSize=%s&aggregationStrategy=#testStrategy",
-                        queueName + "B", completionTimeout, completionSize).routeId("batchConsumerB")
-                                .to("mock:outB");
-
-            }
-        });
-        context.start();
-
-        int messageCount = 5;
-
-        assertTrue(messageCount < SjmsBatchEndpoint.DEFAULT_COMPLETION_SIZE);
-        MockEndpoint mockOutA = getMockEndpoint("mock:outA");
-        mockOutA.expectedMessageCount(1);  // everything batched together
-        MockEndpoint mockOutB = getMockEndpoint("mock:outB");
-        mockOutB.expectedMessageCount(1);  // everything batched together
-
-        template.sendBody("direct:in", generateStrings(messageCount));
-        assertMockEndpointsSatisfied();
-
-        assertFirstMessageBodyOfLength(mockOutA, messageCount);
-        assertFirstMessageBodyOfLength(mockOutB, messageCount);
-    }
-
-    @Test
-    public void testConsumptionRollback() throws Exception {
-        final int completionTimeout = 2000;
-        final int completionSize = 5;
-
-        final String queueName = getQueueName();
-        context.addRoutes(new TransactedSendHarness(queueName));
-        context.addRoutes(new RouteBuilder() {
-            public void configure() throws Exception {
-                fromF("sjms-batch:%s?completionTimeout=%s&completionSize=%s&aggregationStrategy=#testStrategy",
-                        queueName, completionTimeout, completionSize).routeId("batchConsumer").startupOrder(10)
-                                .to("mock:batches");
-            }
-        });
-        context.start();
-
-        int messageCount = 5;
-        MockEndpoint mockBatches = getMockEndpoint("mock:batches");
-        // the first time around, the batch should throw an exception
-        mockBatches.whenExchangeReceived(1, new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                throw new RuntimeException("Boom!");
-            }
-        });
-        // so the batch should be processed twice due to redelivery
-        mockBatches.expectedMessageCount(2);
-
-        template.sendBody("direct:in", generateStrings(messageCount));
-        mockBatches.assertIsSatisfied();
-
-    }
-
-    @Test
-    public void testConsumptionBadSession() throws Exception {
-
-        final int messageCount = 5;
-        final int consumerCount = 1;
-        SjmsBatchComponent sb = (SjmsBatchComponent) context.getComponent("sjms-batch");
-        MockConnectionFactory cf = (MockConnectionFactory) sb.getConnectionFactory();
-        cf.returnBadSessionNTimes(2);
-
-        final String queueName = getQueueName();
-        context.addRoutes(new TransactedSendHarness(queueName));
-        context.addRoutes(new RouteBuilder() {
-            public void configure() throws Exception {
-
-                int completionTimeout = 1000;
-                int completionSize = 200;
-
-                // keepAliveDelay=300 is the key... it's a 300 millis delay between attempts to create a new session.
-                fromF("sjms-batch:%s?completionTimeout=%s&completionSize=%s&consumerCount=%s&aggregationStrategy=#testStrategy&keepAliveDelay=300",
-                        queueName, completionTimeout, completionSize, consumerCount)
-                                .routeId("batchConsumer").startupOrder(10).autoStartup(false)
-                                .split(body())
-                                .to("mock:split");
-            }
-        });
-        context.start();
-
-        MockEndpoint mockBefore = getMockEndpoint("mock:before");
-        mockBefore.setExpectedMessageCount(messageCount);
-
-        MockEndpoint mockSplit = getMockEndpoint("mock:split");
-        mockSplit.setExpectedMessageCount(messageCount);
-
-        LOG.info("Sending messages");
-        template.sendBody("direct:in", generateStrings(messageCount));
-        LOG.info("Send complete");
-
-        StopWatch stopWatch = new StopWatch();
-        context.getRouteController().startRoute("batchConsumer");
-
-        assertMockEndpointsSatisfied();
-        stopWatch.taken();
-    }
-
-    @Test
-    public void testConsumptionCompletionAware() throws Exception {
-        final int completionSize = 5;
-
-        final String queueName = getQueueName();
-        context.addRoutes(new TransactedSendHarness(queueName));
-        context.addRoutes(new RouteBuilder() {
-            public void configure() throws Exception {
-                context.getRegistry().bind("groupedStrategy", AggregationStrategies.groupedBody());
-
-                fromF("sjms-batch:%s?completionSize=%s&aggregationStrategy=#groupedStrategy",
-                        queueName, completionSize).routeId("batchConsumer").startupOrder(10)
-                                .log(LoggingLevel.DEBUG, "${body.size}")
-                                .to("mock:batches");
-            }
-        });
-        context.start();
-
-        MockEndpoint mockBatches = getMockEndpoint("mock:batches");
-        mockBatches.expectedMessageCount(1);
-
-        template.sendBody("direct:in", "A,B,C,D,E");
-
-        mockBatches.assertIsSatisfied();
-
-        Message msg = mockBatches.getExchanges().get(0).getMessage();
-        assertNotNull(msg);
-
-        assertEquals("size", msg.getExchange().getProperty(Exchange.AGGREGATED_COMPLETED_BY));
-
-        List body = msg.getBody(List.class);
-        assertNotNull(body);
-        assertEquals(5, body.size());
-        assertEquals("A", body.get(0));
-        assertEquals("B", body.get(1));
-        assertEquals("C", body.get(2));
-        assertEquals("D", body.get(3));
-        assertEquals("E", body.get(4));
-    }
-
-    @Test
-    public void testStartupRaceCondition() throws Exception {
-        final int routeCount = 10;
-        final int consumerCount = 1;
-
-        List<String> queues = new ArrayList<>();
-
-        String queueNamePrefix = getQueueName();
-
-        // setup routeCount routes, each reading from its own queue but all writing to the same mock endpoint
-        for (int i = 0; i < routeCount; i++) {
-            String queueName = queueNamePrefix + "_" + i;
-            queues.add(queueName);
-            String routeId = "batchConsumer_" + i;
-            context.addRoutes(new RouteBuilder() {
-                public void configure() throws Exception {
-
-                    int completionTimeout = 1000;
-                    int completionSize = 1;
-
-                    fromF("sjms-batch:%s?completionTimeout=%s&completionSize=%s&consumerCount=%s&aggregationStrategy=#testStrategy&keepAliveDelay=100&asyncStartListener=true",
-                            queueName, completionTimeout, completionSize, consumerCount)
-                                    .routeId(routeId).autoStartup(true)
-                                    .split(body())
-                                    .to("mock:split");
-                }
-            });
-        }
-
-        context.start();
-
-        // expect to receive routeCount messages to the mock endpoint
-        MockEndpoint mockSplit = getMockEndpoint("mock:split");
-        mockSplit.setExpectedMessageCount(routeCount);
-
-        // send one message to all the queues
-        queues.forEach(queueName -> template.sendBody("sjms:queue:" + queueName, queueName));
-
-        assertMockEndpointsSatisfied();
-
-    }
-
-    private void assertFirstMessageBodyOfLength(MockEndpoint mockEndpoint, int expectedLength) {
-        Exchange exchange = mockEndpoint.getExchanges().get(0);
-        assertEquals(expectedLength, exchange.getIn().getBody(List.class).size());
-    }
-
-    private String getQueueName() {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyMMddhhmmss");
-        return "sjms-batch-" + sdf.format(new Date());
-    }
-
-    private String[] generateStrings(int messageCount) {
-        String[] strings = new String[messageCount];
-        for (int i = 0; i < messageCount; i++) {
-            strings[i] = "message:" + i;
-        }
-        return strings;
-    }
-
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointTest.java
deleted file mode 100644
index e128ecd..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.batch;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.camel.CamelContext;
-import org.apache.camel.FailedToCreateRouteException;
-import org.apache.camel.FailedToStartRouteException;
-import org.apache.camel.builder.AggregationStrategies;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.sjms.SjmsComponent;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class SjmsBatchEndpointTest extends CamelTestSupport {
-
-    // Create one embedded broker instance for the entire test, as we aren't actually
-    // going to send any messages to it; we just need it so that the ConnectionFactory
-    // has something local to connect to.
-    @RegisterExtension
-    public static EmbeddedActiveMQBroker broker = new EmbeddedActiveMQBroker("localhost");
-
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        SimpleRegistry registry = new SimpleRegistry();
-        registry.bind("aggStrategy", AggregationStrategies.groupedExchange());
-
-        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory();
-        connectionFactory.setBrokerURL(broker.getTcpConnectorUri());
-
-        SjmsComponent sjmsComponent = new SjmsComponent();
-        sjmsComponent.setConnectionFactory(connectionFactory);
-
-        SjmsBatchComponent sjmsBatchComponent = new SjmsBatchComponent();
-        sjmsBatchComponent.setConnectionFactory(connectionFactory);
-
-        CamelContext context = new DefaultCamelContext(registry);
-        context.addComponent("sjms-batch", sjmsBatchComponent);
-        context.addComponent("sjms", sjmsComponent);
-
-        return context;
-    }
-
-    @Override
-    public boolean isUseAdviceWith() {
-        return true;
-    }
-
-    @Test
-    public void testProducerFailure() throws Exception {
-        context.addRoutes(new RouteBuilder() {
-            public void configure() throws Exception {
-                from("direct:in").to("sjms-batch:testQueue?aggregationStrategy=#unknown");
-            }
-        });
-        assertThrows(FailedToCreateRouteException.class,
-                () -> context.start());
-    }
-
-    @Test
-    public void testConsumerNegativePollDuration() throws Exception {
-        context.addRoutes(new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("sjms-batch:in?aggregationStrategy=#aggStrategy&pollDuration=-1")
-                        .to("mock:out");
-            }
-        });
-        assertThrows(FailedToStartRouteException.class,
-                () -> context.start());
-    }
-
-    @Test
-    public void testConsumerNegativeConsumerCount() throws Exception {
-        context.addRoutes(new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("sjms-batch:in?aggregationStrategy=#aggStrategy&consumerCount=-1")
-                        .to("mock:out");
-            }
-        });
-        assertThrows(FailedToStartRouteException.class,
-                () -> context.start());
-    }
-
-    @Test
-    public void testConsumerTopic() throws Exception {
-        context.addRoutes(new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("sjms-batch:topic:in?aggregationStrategy=#aggStrategy")
-                        .to("mock:out");
-            }
-        });
-        assertThrows(FailedToCreateRouteException.class,
-                () -> context.start());
-    }
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
index 9d33763..a585e0c 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
@@ -69,7 +69,7 @@ public class AsyncConsumerInOutTest extends CamelTestSupport {
                         .choice()
                         .when(body().contains("Camel"))
                         .to("async:camel?delay=2000")
-                        .to(ExchangePattern.InOut, "sjms:queue:in.out.test?namedReplyTo=response.queue&synchronous=false")
+                        .to(ExchangePattern.InOut, "sjms:queue:in.out.test?replyTo=response.queue&synchronous=false")
                         .to("mock:result")
                         .otherwise()
                         .to("log:other")
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
index 06a40eb..1332f7e 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
@@ -16,24 +16,16 @@
  */
 package org.apache.camel.component.sjms.consumer;
 
-import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.sjms.SjmsComponent;
-import org.apache.camel.component.sjms.jms.ConnectionFactoryResource;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.component.sjms.support.JmsTestSupport;
 import org.junit.jupiter.api.Test;
 
-public class InOnlyTopicDurableConsumerTest extends CamelTestSupport {
+public class InOnlyTopicDurableConsumerTest extends JmsTestSupport {
 
     private static final String CONNECTION_ID = "test-connection-1";
-    private static final String BROKER_URI = "vm://durable.broker?broker.persistent=false&broker.useJmx=false";
-
-    @Override
-    protected boolean useJmx() {
-        return false;
-    }
 
     @Test
     public void testDurableTopic() throws Exception {
@@ -51,24 +43,12 @@ public class InOnlyTopicDurableConsumerTest extends CamelTestSupport {
         assertMockEndpointsSatisfied();
     }
 
-    /*
-     * @see org.apache.camel.test.junit5.CamelTestSupport#createCamelContext()
-     *
-     * @return
-     * @throws Exception
-     */
     @Override
     protected CamelContext createCamelContext() throws Exception {
-        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(BROKER_URI);
-        ConnectionFactoryResource connectionResource = new ConnectionFactoryResource();
-        connectionResource.setConnectionFactory(connectionFactory);
-        connectionResource.setClientId(CONNECTION_ID);
-        CamelContext camelContext = super.createCamelContext();
-        SjmsComponent component = new SjmsComponent();
-        component.setConnectionResource(connectionResource);
-        component.setConnectionCount(1);
-        camelContext.addComponent("sjms", component);
-        return camelContext;
+        CamelContext context = super.createCamelContext();
+        SjmsComponent sjms = context.getComponent("sjms", SjmsComponent.class);
+        sjms.setConnectionClientId(CONNECTION_ID);
+        return context;
     }
 
     @Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java
index 7164263..3822484 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java
@@ -77,10 +77,10 @@ public class InOutConcurrentConsumerTest extends JmsTestSupport {
         return new RouteBuilder() {
             public void configure() throws Exception {
                 from("direct:start")
-                        .to("sjms:a?consumerCount=5&exchangePattern=InOut&namedReplyTo=myResponse")
+                        .to("sjms:a?consumerCount=5&exchangePattern=InOut&replyTo=myResponse")
                         .to("mock:result");
 
-                from("sjms:a?consumerCount=5&exchangePattern=InOut&namedReplyTo=myResponse")
+                from("sjms:a?consumerCount=5&exchangePattern=InOut&replyTo=myResponse")
                         .process(exchange -> {
                             String body = exchange.getIn().getBody(String.class);
                             // sleep a little to simulate heavy work and force concurrency processing
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java
index 2b32c10..9d962ab 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java
@@ -39,7 +39,7 @@ public class InOutConsumerQueueAsyncTest extends JmsTestSupport {
         return new RouteBuilder() {
             public void configure() throws Exception {
                 from("sjms:queue:start?synchronous=false")
-                        .to("sjms:queue:in.out.queue?exchangePattern=InOut&synchronous=false&namedReplyTo=in.out.queue.response")
+                        .to("sjms:queue:in.out.queue?exchangePattern=InOut&synchronous=false&replyTo=in.out.queue.response")
                         .to("mock:result");
 
                 from("sjms:queue:in.out.queue?exchangePattern=InOut&synchronous=false").to("log:before")
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java
index 0334b10..cf0c6c6 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java
@@ -38,7 +38,7 @@ public class InOutConsumerQueueTest extends JmsTestSupport {
         return new RouteBuilder() {
             public void configure() throws Exception {
                 from("sjms:queue:start").to("log:request")
-                        .to("sjms:queue:in.out.queue?exchangePattern=InOut&namedReplyTo=in.out.queue.response")
+                        .to("sjms:queue:in.out.queue?exchangePattern=InOut&replyTo=in.out.queue.response")
                         .to("log:response").to("mock:result");
 
                 from("sjms:queue:in.out.queue?exchangePattern=InOut").process(new Processor() {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTopicTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTopicTest.java
index a3c9301..51ea7ca 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTopicTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTopicTest.java
@@ -43,7 +43,7 @@ public class InOutConsumerTopicTest extends JmsTestSupport {
         return new RouteBuilder() {
             public void configure() throws Exception {
                 from("sjms:topic:start").to("log:request")
-                        .to("sjms:topic:in.out.topic?exchangePattern=InOut&namedReplyTo=in.out.topic.response")
+                        .to("sjms:topic:in.out.topic?exchangePattern=InOut&replyTo=in.out.topic.response")
                         .to("log:response").to("mock:result");
 
                 from("sjms:topic:in.out.topic?exchangePattern=InOut").process(new Processor() {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java
index 9bcb062..a913e08 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java
@@ -28,7 +28,7 @@ public class InOutSynchronousConsumerTest extends JmsTestSupport {
 
     private static String beforeThreadName;
     private static String afterThreadName;
-    private String url = "sjms:queue:in?namedReplyTo=response.queue";
+    private String url = "sjms:queue:in?replyTo=response.queue";
 
     @Test
     public void testSynchronous() throws Exception {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
index f98e579..9a6658c 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
@@ -28,7 +28,7 @@ import static org.apache.camel.test.junit5.TestSupport.body;
 
 /**
  * Integration test that verifies the ability of SJMS to correctly process asynchronous InOut exchanges from both the
- * Producer and Consumer perspective using a namedReplyTo destination.
+ * Producer and Consumer perspective using a replyTo destination.
  */
 public class AsyncJmsInOutIT extends JmsTestSupport {
 
@@ -57,7 +57,7 @@ public class AsyncJmsInOutIT extends JmsTestSupport {
             public void configure() throws Exception {
 
                 from("seda:start")
-                        .to("sjms:queue:in.foo?synchronous=false&namedReplyTo=out.bar&exchangePattern=InOut")
+                        .to("sjms:queue:in.foo?synchronous=false&replyTo=out.bar&exchangePattern=InOut")
                         .to("mock:result");
 
                 from("sjms:queue:in.foo?synchronous=false&exchangePattern=InOut")
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java
index cf13d4c..c65accb 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java
@@ -97,7 +97,7 @@ public class ConnectionResourceIT extends JmsTestSupport {
             public void configure() throws Exception {
 
                 from("seda:start")
-                        .to("sjms:queue:in.foo?namedReplyTo=out.bar&exchangePattern=InOut&producerCount=5")
+                        .to("sjms:queue:in.foo?replyTo=out.bar&exchangePattern=InOut")
                         .to("mock:result");
 
                 from("sjms:queue:in.foo?exchangePattern=InOut&consumerCount=20")
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java
index f9c178e..aed525f 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java
@@ -28,7 +28,7 @@ import static org.apache.camel.test.junit5.TestSupport.body;
 
 /**
  * Integration test that verifies the ability of SJMS to correctly process synchronous InOut exchanges from both the
- * Producer and Consumer perspective using a namedReplyTo destination.
+ * Producer and Consumer perspective using a replyTo destination.
  */
 public class SyncJmsInOutIT extends JmsTestSupport {
 
@@ -57,7 +57,7 @@ public class SyncJmsInOutIT extends JmsTestSupport {
             public void configure() throws Exception {
 
                 from("seda:start")
-                        .to("sjms:queue:in.foo?namedReplyTo=out.bar&exchangePattern=InOut")
+                        .to("sjms:queue:in.foo?replyTo=out.bar&exchangePattern=InOut")
                         .to("mock:result");
 
                 from("sjms:queue:in.foo?exchangePattern=InOut")
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualBatchFromQueueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualBatchFromQueueTest.java
deleted file mode 100644
index e7ee8b4..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualBatchFromQueueTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.manual;
-
-import java.util.concurrent.TimeUnit;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.camel.CamelContext;
-import org.apache.camel.RoutesBuilder;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.sjms.batch.ListAggregationStrategy;
-import org.apache.camel.component.sjms.batch.SjmsBatchComponent;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Disabled("Manual test")
-public class ManualBatchFromQueueTest extends CamelTestSupport {
-
-    protected final Logger log = LoggerFactory.getLogger(getClass());
-
-    // using failover will automatic re-connect with ActiveMQ
-    // private String url = "failover:tcp://localhost:61616";
-    private String url = "tcp://localhost:61616";
-
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        SimpleRegistry registry = new SimpleRegistry();
-        registry.bind("testStrategy", new ListAggregationStrategy());
-
-        CamelContext camel = new DefaultCamelContext(registry);
-
-        SjmsBatchComponent sjms = new SjmsBatchComponent();
-        sjms.setAsyncStartListener(true);
-        log.info("Using live connection to existing ActiveMQ broker running on {}", url);
-        sjms.setConnectionFactory(new ActiveMQConnectionFactory(url));
-
-        camel.addComponent("sjms-batch", sjms);
-
-        return camel;
-    }
-
-    @Test
-    public void testConsume() throws Exception {
-        getMockEndpoint("mock:foo").expectedMinimumMessageCount(1);
-
-        assertMockEndpointsSatisfied(1, TimeUnit.MINUTES);
-    }
-
-    @Override
-    protected RoutesBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("sjms-batch:queue:foo?asyncStartListener=true&completionSize=3&completionTimeout=60000&aggregationStrategy=#testStrategy")
-                        .to("log:foo")
-                        .to("mock:foo");
-            }
-        };
-    }
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
index a61997a..aaa2a31 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
@@ -111,22 +111,15 @@ public class InOutQueueProducerAsyncLoadTest extends JmsTestSupport {
         }
     }
 
-    /**
-     * @see              org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
-     * 
-     * @return
-     * 
-     * @throws Exception
-     */
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
                 from("direct:start")
                         .to("log:" + TEST_DESTINATION_NAME + ".in.log?showBody=true")
-                        .to(ExchangePattern.InOut, "sjms:queue:" + TEST_DESTINATION_NAME + ".request" + "?namedReplyTo="
+                        .to(ExchangePattern.InOut, "sjms:queue:" + TEST_DESTINATION_NAME + ".request" + "?replyTo="
                                                    + TEST_DESTINATION_NAME
-                                                   + ".response&consumerCount=10&producerCount=20&synchronous=false")
+                                                   + ".response&consumerCount=10&synchronous=false")
                         .threads(20)
                         .to("log:" + TEST_DESTINATION_NAME + ".out.log?showBody=true");
             }
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
index dfb8841..445cc01 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
@@ -75,8 +75,6 @@ public class InOutQueueProducerSyncLoadTest extends JmsTestSupport {
 
     /**
      * Test to verify that when using the consumer listener for the InOut producer we get the correct message back.
-     * 
-     * @throws Exception
      */
     @Test
     public void testInOutQueueProducer() throws Exception {
@@ -111,22 +109,15 @@ public class InOutQueueProducerSyncLoadTest extends JmsTestSupport {
         }
     }
 
-    /*
-     * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
-     * 
-     * @return
-     * 
-     * @throws Exception
-     */
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
                 from("direct:start")
                         .to("log:" + TEST_DESTINATION_NAME + ".in.log?showBody=true")
-                        .to(ExchangePattern.InOut, "sjms:queue:" + TEST_DESTINATION_NAME + ".request" + "?namedReplyTo="
+                        .to(ExchangePattern.InOut, "sjms:queue:" + TEST_DESTINATION_NAME + ".request" + "?replyTo="
                                                    + TEST_DESTINATION_NAME
-                                                   + ".response&consumerCount=20&producerCount=40&synchronous=true")
+                                                   + ".response&consumerCount=20&synchronous=true")
                         .to("log:" + TEST_DESTINATION_NAME + ".out.log?showBody=true");
             }
         };
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java
index df2dbcc..5a21633 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java
@@ -112,7 +112,7 @@ public class InOutQueueProducerTest extends JmsTestSupport {
             public void configure() {
                 from("direct:start")
                         .to("log:" + TEST_DESTINATION_NAME + ".in.log.1?showBody=true")
-                        .to(ExchangePattern.InOut, "sjms:queue:" + TEST_DESTINATION_NAME + ".request" + "?namedReplyTo="
+                        .to(ExchangePattern.InOut, "sjms:queue:" + TEST_DESTINATION_NAME + ".request" + "?replyTo="
                                                    + TEST_DESTINATION_NAME + ".response")
                         .to("log:" + TEST_DESTINATION_NAME + ".out.log.1?showBody=true");
             }
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/PrefillPoolTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/PrefillPoolTest.java
deleted file mode 100644
index f2d65f6..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/PrefillPoolTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.producer;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.jupiter.api.Test;
-
-/**
- * Test Producer prefillPool parameter
- */
-public class PrefillPoolTest extends JmsTestSupport {
-
-    @Test
-    public void testProducerWithPrefill() throws Exception {
-        sendBodyAndAssert("sjms:queue:producer");
-    }
-
-    @Test
-    public void testProducerWithoutPrefill() throws Exception {
-        sendBodyAndAssert("sjms:queue:producer?prefillPool=false");
-    }
-
-    private void sendBodyAndAssert(final String uri) throws InterruptedException {
-        String body1 = "Hello World";
-        String body2 = "G'day World";
-        MockEndpoint result = getMockEndpoint("mock:result");
-        result.expectedBodiesReceived(body1, body2);
-        template.sendBody(uri, body1);
-        template.sendBody(uri, body2);
-        result.assertIsSatisfied();
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            public void configure() throws Exception {
-                from("sjms:queue:producer").to("mock:result");
-            }
-        };
-    }
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java
index f0907d4..4b1b1bf 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java
@@ -47,7 +47,7 @@ public class QueueProducerQoSTest extends JmsTestSupport {
         assumeFalse(externalAmq);
         mockExpiredAdvisory.expectedMessageCount(1);
 
-        String endpoint = String.format("sjms:queue:%s?ttl=1000&exchangePattern=InOut&responseTimeOut=500",
+        String endpoint = String.format("sjms:queue:%s?timeToLive=1000&exchangePattern=InOut&requestTimeout=500",
                 TEST_INOUT_DESTINATION_NAME);
 
         try {
@@ -71,7 +71,7 @@ public class QueueProducerQoSTest extends JmsTestSupport {
         assumeFalse(externalAmq);
         mockExpiredAdvisory.expectedMessageCount(1);
 
-        String endpoint = String.format("sjms:queue:%s?ttl=1000", TEST_INONLY_DESTINATION_NAME);
+        String endpoint = String.format("sjms:queue:%s?timeToLive=1000", TEST_INONLY_DESTINATION_NAME);
         template.sendBody(endpoint, "test message");
 
         assertMockEndpointsSatisfied();
@@ -108,6 +108,7 @@ public class QueueProducerQoSTest extends JmsTestSupport {
             public void configure() throws Exception {
                 from("sjms:topic:ActiveMQ.Advisory.Expired.Queue.>")
                         .routeId(EXPIRED_MESSAGE_ROUTE_ID)
+                        .log("Expired message")
                         .to(MOCK_EXPIRED_ADVISORY);
             }
         };
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
index e1b6fbb..cf6856d 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
@@ -97,8 +97,13 @@ public class JmsTestSupport extends CamelTestSupport {
         }
     }
 
+    @Override
+    protected boolean useJmx() {
+        return false;
+    }
+
     protected void configureBroker(BrokerService broker) throws Exception {
-        broker.setUseJmx(true);
+        broker.setUseJmx(false);
         broker.setPersistent(false);
         broker.deleteAllMessages();
         broker.addConnector(brokerUri);
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
deleted file mode 100644
index fe59338..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.tx;
-
-import org.junit.jupiter.api.Test;
-
-/**
- * Verify the ability to batch transactions to the consumer.
- */
-public class BatchTransactedConcurrentMultipleConsumerTest extends TransactedConsumerSupport {
-
-    private static final String BROKER_URI = "vm://btcmc_test_broker?broker.persistent=false&broker.useJmx=false";
-
-    /**
-     * We want to verify that when consuming from a single destination with multiple routes that we are thread safe and
-     * behave accordingly.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testRoute() throws Exception {
-        final String destinationName = "sjms:queue:two.consumer.one.route.batch.tx.test";
-        int routeCount = 1;
-        int consumerCount = 2;
-        int batchCount = 5;
-        int messageCount = 20;
-        int maxAttemptsCount = 10;
-        int totalRedeliverdFalse = 20;
-        int totalRedeliveredTrue = 5;
-        runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue, batchCount,
-                consumerCount, maxAttemptsCount);
-    }
-
-    @Override
-    public String getBrokerUri() {
-        return BROKER_URI;
-    }
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
deleted file mode 100644
index 7853c53..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.tx;
-
-import org.junit.jupiter.api.Test;
-
-/**
- * Verify that batch transactions are processed correctly when dealing with multiple routes consuming from a single
- * destination.
- */
-public class BatchTransactedConcurrentMultipleRouteConsumersTest extends TransactedConsumerSupport {
-
-    private static final String BROKER_URI = "vm://btcmrc_test_broker?broker.persistent=false&broker.useJmx=false";
-
-    /**
-     * We want to verify that when consuming from a single destination with multiple routes that we are thread safe and
-     * behave accordingly.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testRoute() throws Exception {
-        final String destinationName = "sjms:queue:one.consumer.two.route.batch.tx.test";
-        int routeCount = 2;
-        int consumerCount = 1;
-        int batchCount = 5;
-        int messageCount = 20;
-        int maxAttemptsCount = 10;
-        int totalRedeliverdFalse = 10;
-        int totalRedeliveredTrue = 5;
-        runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue, batchCount,
-                consumerCount, maxAttemptsCount);
-    }
-
-    @Override
-    public String getBrokerUri() {
-        return BROKER_URI;
-    }
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueConsumerTest.java
deleted file mode 100644
index c2fced1..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueConsumerTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.tx;
-
-import org.junit.jupiter.api.Test;
-
-/**
- * Verify the ability to batch transactions to the consumer.
- *
- */
-public class BatchTransactedQueueConsumerTest extends TransactedConsumerSupport {
-
-    private static final String BROKER_URI = "vm://btqc_test_broker?broker.persistent=false&broker.useJmx=false";
-
-    /**
-     * We want to verify that when consuming from a single destination with multiple routes that we are thread safe and
-     * behave accordingly.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testRoute() throws Exception {
-        final String destinationName = "sjms:queue:one.consumer.one.route.batch.tx.test";
-        int routeCount = 1;
-        int consumerCount = 1;
-        int batchCount = 5;
-        int messageCount = 20;
-        int maxAttemptsCount = 10;
-        int totalRedeliverdFalse = 20;
-        int totalRedeliveredTrue = 5;
-        runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue, batchCount,
-                consumerCount, maxAttemptsCount);
-    }
-
-    @Override
-    public String getBrokerUri() {
-        return BROKER_URI;
-    }
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerMultipleRouteTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerMultipleRouteTest.java
deleted file mode 100644
index 91cae33..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerMultipleRouteTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.tx;
-
-import org.junit.jupiter.api.Test;
-
-/**
- * Verify the ability to batch transactions to the consumer.
- *
- */
-public class BatchTransactedTopicConsumerMultipleRouteTest extends TransactedConsumerSupport {
-
-    private static final String BROKER_URI = "vm://bttcmr_test_broker?broker.persistent=false&broker.useJmx=false";
-
-    /**
-     * We want to verify that when consuming from a single destination with multiple routes that we are thread safe and
-     * behave accordingly.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testRoute() throws Exception {
-        final String destinationName = "sjms:topic:one.consumer.two.route.batch.tx.test";
-        int routeCount = 2;
-        int consumerCount = 1;
-        int batchCount = 5;
-        int messageCount = 20;
-        int maxAttemptsCount = 10;
-        int totalRedeliverdFalse = 20;
-        int totalRedeliveredTrue = 5;
-        runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue, batchCount,
-                consumerCount, maxAttemptsCount);
-    }
-
-    @Override
-    public String getBrokerUri() {
-        return BROKER_URI;
-    }
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java
deleted file mode 100644
index 85bc444..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.tx;
-
-import org.junit.jupiter.api.Test;
-
-/**
- * Verify the ability to batch transactions to the consumer.
- *
- */
-public class BatchTransactedTopicConsumerTest extends TransactedConsumerSupport {
-
-    private static final String BROKER_URI = "vm://bttc_test_broker?broker.persistent=false&broker.useJmx=false";
-
-    /**
-     * We want to verify that when consuming from a single destination with multiple routes that we are thread safe and
-     * behave accordingly.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testRoute() throws Exception {
-        final String destinationName = "sjms:topic:one.consumer.one.route.batch.tx.test";
-        int routeCount = 1;
-        int consumerCount = 1;
-        int batchCount = 5;
-        int messageCount = 20;
-        int maxAttemptsCount = 10;
-        int totalRedeliverdFalse = 20;
-        int totalRedeliveredTrue = 5;
-        runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue, batchCount,
-                consumerCount, maxAttemptsCount);
-    }
-
-    @Override
-    public String getBrokerUri() {
-        return BROKER_URI;
-    }
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
index 1ff457f..7a484d6 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
@@ -28,20 +28,17 @@ public class TransactedConcurrentConsumersTest extends TransactedConsumerSupport
     /**
      * We want to verify that when consuming from a single destination with multiple routes that we are thread safe and
      * behave accordingly.
-     * 
-     * @throws Exception
      */
     @Test
     public void testRoute() throws Exception {
         final String destinationName = "sjms:queue:one.consumer.one.route.test";
         int routeCount = 1;
         int consumerCount = 2;
-        int batchCount = 1;
         int messageCount = 20;
         int maxAttemptsCount = 10;
         int totalRedeliverdFalse = 20;
         int totalRedeliveredTrue = 1;
-        runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue, batchCount,
+        runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue,
                 consumerCount, maxAttemptsCount);
     }
 
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java
index e17e9ab..38d8217 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java
@@ -38,7 +38,7 @@ public abstract class TransactedConsumerSupport extends CamelTestSupport {
 
     protected void runTest(
             String destinationName, int routeCount, int messageCount, int totalRedeliverdFalse, int totalRedeliveredTrue,
-            int batchCount, int consumerCount, int maxAttemptsCount)
+            int consumerCount, int maxAttemptsCount)
             throws Exception {
         // The CountDownLatch is used to make our final assertions await
         // unit all the messages have been processed. It is also
@@ -48,7 +48,7 @@ public abstract class TransactedConsumerSupport extends CamelTestSupport {
 
         for (int i = 1; i <= routeCount; i++) {
             // We add a route here so we can pass our latch into it.
-            addRoute(destinationName, i, batchCount, consumerCount, maxAttemptsCount, latch);
+            addRoute(destinationName, i, consumerCount, maxAttemptsCount, latch);
             // Create mock endpoints for the before and after
             getMockEndpoint("mock:test.before." + i).expectedMessageCount(totalRedeliverdFalse);
             getMockEndpoint("mock:test.after." + i).expectedMessageCount(totalRedeliveredTrue);
@@ -89,7 +89,7 @@ public abstract class TransactedConsumerSupport extends CamelTestSupport {
     }
 
     protected void addRoute(
-            final String destinationName, final int routeNumber, final int batchCount, final int consumerCount,
+            final String destinationName, final int routeNumber, final int consumerCount,
             final int maxAttemptsCount, final CountDownLatch latch)
             throws Exception {
         context.addRoutes(new RouteBuilder() {
@@ -103,7 +103,7 @@ public abstract class TransactedConsumerSupport extends CamelTestSupport {
                 }
 
                 // Our test consumer route
-                from(destinationName + "?transacted=true&transactionBatchCount=" + batchCount + "&consumerCount="
+                from(destinationName + "?transacted=true&consumerCount="
                      + consumerCount)
                              .id("consumer.route." + routeNumber)
                              // first consume all the messages that are not redelivered
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java
index a190983..d8c1587 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java
@@ -28,20 +28,17 @@ public class TransactedConsumersMultipleRouteTest extends TransactedConsumerSupp
     /**
      * We want to verify that when consuming from a single destination with multiple routes that we are thread safe and
      * behave accordingly.
-     * 
-     * @throws Exception
      */
     @Test
     public void testRoute() throws Exception {
         final String destinationName = "sjms:queue:one.consumer.one.route.test";
         int routeCount = 2;
         int consumerCount = 1;
-        int batchCount = 1;
         int messageCount = 20;
         int maxAttemptsCount = 10;
         int totalRedeliverdFalse = 10;
         int totalRedeliveredTrue = 1;
-        runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue, batchCount,
+        runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue,
                 consumerCount, maxAttemptsCount);
     }
 
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java
index e2b15db..57d1218 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java
@@ -53,7 +53,7 @@ public class TransactedProducerInOutErrorTest {
             public void configure() throws Exception {
 
                 from("direct:start")
-                        .to("sjms:queue:test-in?namedReplyTo=test-out&exchangePattern=InOut&transacted=true")
+                        .to("sjms:queue:test-in?replyTo=test-out&exchangePattern=InOut&transacted=true")
                         .to("mock:result");
 
                 from("sjms:queue:test-in?exchangePattern=InOut")
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
index a7e86d8..27ab277 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
@@ -25,20 +25,17 @@ public class TransactedQueueConsumerTest extends TransactedConsumerSupport {
     /**
      * We want to verify that when consuming from a single destination with multiple routes that we are thread safe and
      * behave accordingly.
-     * 
-     * @throws Exception
      */
     @Test
     public void testRoute() throws Exception {
         final String destinationName = "sjms:queue:one.consumer.one.route.tx.test";
         int routeCount = 1;
         int consumerCount = 1;
-        int batchCount = 1;
         int messageCount = 20;
         int maxAttemptsCount = 10;
         int totalRedeliverdFalse = 20;
         int totalRedeliveredTrue = 1;
-        runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue, batchCount,
+        runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue,
                 consumerCount, maxAttemptsCount);
     }
 
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
index ec6212e..ee0f2c8 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
@@ -36,14 +36,6 @@ public class TransactedQueueProducerTest extends CamelTestSupport {
     @Produce
     protected ProducerTemplate template;
 
-    public TransactedQueueProducerTest() {
-    }
-
-    @Override
-    protected boolean useJmx() {
-        return false;
-    }
-
     @Test
     public void testRoute() throws Exception {
 
@@ -61,11 +53,6 @@ public class TransactedQueueProducerTest extends CamelTestSupport {
         mock.assertIsSatisfied();
     }
 
-    /*
-     * @see org.apache.camel.test.junit5.CamelTestSupport#createCamelContext()
-     * @return
-     * @throws Exception
-     */
     @Override
     protected CamelContext createCamelContext() throws Exception {
         ActiveMQConnectionFactory connectionFactory
@@ -77,11 +64,6 @@ public class TransactedQueueProducerTest extends CamelTestSupport {
         return camelContext;
     }
 
-    /*
-     * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
-     * @return
-     * @throws Exception
-     */
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
index 73d4242..4afe922 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
@@ -25,8 +25,6 @@ public class TransactedTopicConsumerTest extends TransactedConsumerSupport {
     /**
      * We want to verify that when consuming from a single destination with multiple routes that we are thread safe and
      * behave accordingly.
-     * 
-     * @throws Exception
      */
     @Test
     public void testRoute() throws Exception {
@@ -38,7 +36,7 @@ public class TransactedTopicConsumerTest extends TransactedConsumerSupport {
         int maxAttemptsCount = 10;
         int totalRedeliverdFalse = 20;
         int totalRedeliveredTrue = 1;
-        runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue, batchCount,
+        runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue,
                 consumerCount, maxAttemptsCount);
     }
 
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
index 4bdb9ef..1b98985 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.sjms.tx;
 
-import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -26,13 +25,14 @@ import org.apache.camel.RollbackExchangeException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.sjms.SjmsComponent;
-import org.apache.camel.component.sjms.jms.ConnectionFactoryResource;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.component.sjms.support.JmsTestSupport;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class TransactedTopicProducerTest extends CamelTestSupport {
+public class TransactedTopicProducerTest extends JmsTestSupport {
+
+    private static final String CONNECTION_ID = "test-connection-1";
 
     @Produce
     protected ProducerTemplate template;
@@ -40,14 +40,8 @@ public class TransactedTopicProducerTest extends CamelTestSupport {
     public TransactedTopicProducerTest() {
     }
 
-    @Override
-    protected boolean useJmx() {
-        return false;
-    }
-
     @Test
     public void testRoute() throws Exception {
-
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedBodiesReceived("Hello World 2");
 
@@ -62,31 +56,14 @@ public class TransactedTopicProducerTest extends CamelTestSupport {
         mock.assertIsSatisfied();
     }
 
-    /*
-     * @see org.apache.camel.test.junit5.CamelTestSupport#createCamelContext()
-     * @return
-     * @throws Exception
-     */
     @Override
     protected CamelContext createCamelContext() throws Exception {
-        ActiveMQConnectionFactory connectionFactory
-                = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
-        ConnectionFactoryResource connectionResource = new ConnectionFactoryResource();
-        connectionResource.setConnectionFactory(connectionFactory);
-        connectionResource.setClientId("test-connection-1");
-        CamelContext camelContext = super.createCamelContext();
-        SjmsComponent component = new SjmsComponent();
-        component.setConnectionResource(connectionResource);
-        component.setConnectionCount(1);
-        camelContext.addComponent("sjms", component);
-        return camelContext;
+        CamelContext context = super.createCamelContext();
+        SjmsComponent sjms = context.getComponent("sjms", SjmsComponent.class);
+        sjms.setConnectionClientId(CONNECTION_ID);
+        return context;
     }
 
-    /*
-     * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
-     * @return
-     * @throws Exception
-     */
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
diff --git a/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java b/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java
index ab75bbe..0f1fa10 100644
--- a/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java
+++ b/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java
@@ -20,7 +20,7 @@ public class Sjms2EndpointUriFactory extends org.apache.camel.support.component.
     private static final Set<String> PROPERTY_NAMES;
     private static final Set<String> SECRET_PROPERTY_NAMES;
     static {
-        Set<String> props = new HashSet<>(42);
+        Set<String> props = new HashSet<>(45);
         props.add("shared");
         props.add("reconnectBackOff");
         props.add("connectionCount");
@@ -28,12 +28,14 @@ public class Sjms2EndpointUriFactory extends org.apache.camel.support.component.
         props.add("synchronous");
         props.add("connectionResource");
         props.add("includeAllJMSXProperties");
+        props.add("explicitQosEnabled");
         props.add("transacted");
         props.add("errorHandlerLogStackTrace");
         props.add("durable");
+        props.add("timeToLive");
         props.add("bridgeErrorHandler");
-        props.add("transactionBatchCount");
         props.add("jmsKeyFormatStrategy");
+        props.add("deliveryMode");
         props.add("headerFilterStrategy");
         props.add("exceptionListener");
         props.add("destinationName");
@@ -41,28 +43,29 @@ public class Sjms2EndpointUriFactory extends org.apache.camel.support.component.
         props.add("asyncStopListener");
         props.add("destinationType");
         props.add("asyncStartListener");
-        props.add("persistent");
+        props.add("requestTimeout");
         props.add("allowNullBody");
-        props.add("namedReplyTo");
+        props.add("replyToDeliveryPersistent");
+        props.add("disableReplyTo");
         props.add("reconnectOnError");
         props.add("consumerCount");
         props.add("destinationCreationStrategy");
         props.add("exchangePattern");
-        props.add("prefillPool");
         props.add("messageSelector");
-        props.add("ttl");
+        props.add("deliveryPersistent");
+        props.add("preserveMessageQos");
+        props.add("priority");
         props.add("acknowledgementMode");
-        props.add("transactionBatchTimeout");
         props.add("lazyStartProducer");
         props.add("transactionCommitStrategy");
         props.add("connectionFactory");
-        props.add("producerCount");
+        props.add("replyTo");
+        props.add("replyToOverride");
         props.add("errorHandlerLoggingLevel");
         props.add("sharedJMSSession");
         props.add("durableSubscriptionId");
         props.add("subscriptionId");
         props.add("exceptionHandler");
-        props.add("responseTimeOut");
         PROPERTY_NAMES = Collections.unmodifiableSet(props);
         SECRET_PROPERTY_NAMES = Collections.emptySet();
     }
diff --git a/components/camel-sjms2/src/generated/resources/org/apache/camel/component/sjms2/sjms2.json b/components/camel-sjms2/src/generated/resources/org/apache/camel/component/sjms2/sjms2.json
index 09930ab..8117c35 100644
--- a/components/camel-sjms2/src/generated/resources/org/apache/camel/component/sjms2/sjms2.json
+++ b/components/camel-sjms2/src/generated/resources/org/apache/camel/component/sjms2/sjms2.json
@@ -36,7 +36,6 @@
     "destinationCreationStrategy": { "kind": "property", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
     "jmsKeyFormatStrategy": { "kind": "property", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The defau [...]
     "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
-    "timedTaskManager": { "kind": "property", "displayName": "Timed Task Manager", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.taskmanager.TimedTaskManager", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom TimedTaskManager" },
     "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "connectionPassword": { "kind": "property", "displayName": "Connection Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
     "connectionUsername": { "kind": "property", "displayName": "Connection Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
@@ -46,29 +45,34 @@
     "destinationType": { "kind": "path", "displayName": "Destination Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "queue", "topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "queue", "description": "The kind of destination to use" },
     "destinationName": { "kind": "path", "displayName": "Destination Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "DestinationName is a JMS queue or topic name. By default, the destinationName is interpreted as a queue name." },
     "acknowledgementMode": { "kind": "parameter", "displayName": "Acknowledgement Mode", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.SessionAcknowledgementType", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "description": "The JMS acknowledgement name, which is one of:  [...]
+    "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from  [...]
+    "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
     "consumerCount": { "kind": "parameter", "displayName": "Consumer Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Sets the number of consumer listeners used for this endpoint." },
     "durable": { "kind": "parameter", "displayName": "Durable", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets topic consumer to durable." },
     "durableSubscriptionId": { "kind": "parameter", "displayName": "Durable Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the durable subscription Id required for durable topics." },
     "reconnectBackOff": { "kind": "parameter", "displayName": "Reconnect Back Off", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Backoff in millis on consumer pool reconnection attempts" },
     "reconnectOnError": { "kind": "parameter", "displayName": "Reconnect On Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Try to apply reconnection logic on consumer pool" },
+    "replyToDeliveryPersistent": { "kind": "parameter", "displayName": "Reply To Delivery Persistent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to use persistent delivery by default for replies." },
     "shared": { "kind": "parameter", "displayName": "Shared", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets the consumer to shared." },
     "subscriptionId": { "kind": "parameter", "displayName": "Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the subscription Id, required for durable or shared topics." },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported)." },
     "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
     "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
     "messageSelector": { "kind": "parameter", "displayName": "Message Selector", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the JMS Message selector syntax." },
+    "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2." },
+    "deliveryPersistent": { "kind": "parameter", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether persistent delivery is used by default." },
+    "explicitQosEnabled": { "kind": "parameter", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "description": "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 timeToLi [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
-    "namedReplyTo": { "kind": "parameter", "displayName": "Named Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the reply to destination name used for InOut producer endpoints. The type of the reply to destination can be determined by the starting prefix (topic: or queue:) in its name." },
-    "persistent": { "kind": "parameter", "displayName": "Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Flag used to enable\/disable message persistence." },
-    "producerCount": { "kind": "parameter", "displayName": "Producer Count", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Sets the number of producers used for this endpoint." },
-    "ttl": { "kind": "parameter", "displayName": "Ttl", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "-1", "description": "Flag used to adjust the Time To Live value of produced messages." },
+    "preserveMessageQos": { "kind": "parameter", "displayName": "Preserve Message Qos", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDelive [...]
+    "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "description": "Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in orde [...]
+    "replyToOverride": { "kind": "parameter", "displayName": "Reply To Override", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination." },
+    "requestTimeout": { "kind": "parameter", "displayName": "Request Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "20000", "description": "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 timeou [...]
+    "timeToLive": { "kind": "parameter", "displayName": "Time To Live", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "description": "When sending messages, specifies the time-to-live of the message (in milliseconds)." },
     "allowNullBody": { "kind": "parameter", "displayName": "Allow Null Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an JMSException is thrown." },
-    "prefillPool": { "kind": "parameter", "displayName": "Prefill Pool", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to prefill the producer connection pool on startup, or create connections lazy when needed." },
-    "responseTimeOut": { "kind": "parameter", "displayName": "Response Time Out", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5s", "description": "Sets the amount of time we should wait before timing out a InOut response." },
     "asyncStartListener": { "kind": "parameter", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/o [...]
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to stop the consumer message listener asynchronously, when stopping a route." },
-    "connectionCount": { "kind": "parameter", "displayName": "Connection Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "The maximum number of connections available to this endpoint" },
+    "connectionCount": { "kind": "parameter", "displayName": "Connection Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "description": "The maximum number of connections available to this endpoint" },
     "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any" },
     "connectionResource": { "kind": "parameter", "displayName": "Connection Resource", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.ConnectionResource", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any" },
     "destinationCreationStrategy": { "kind": "parameter", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
@@ -81,8 +85,6 @@
     "errorHandlerLoggingLevel": { "kind": "parameter", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "description": "Allows to configure the default errorHandler logging level for logging uncaught exceptions." },
     "errorHandlerLogStackTrace": { "kind": "parameter", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Allows to control whether stacktraces should be logged or not, by the default errorHandler." },
     "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to use transacted mode" },
-    "transactionBatchCount": { "kind": "parameter", "displayName": "Transaction Batch Count", "group": "transaction", "label": "consumer,transaction", "required": false, "type": "integer", "javaType": "int", "deprecated": true, "autowired": false, "secret": false, "defaultValue": -1, "description": "If transacted sets the number of messages to process before committing a transaction." },
-    "transactionBatchTimeout": { "kind": "parameter", "displayName": "Transaction Batch Timeout", "group": "transaction", "label": "consumer,transaction", "required": false, "type": "duration", "javaType": "long", "deprecated": true, "autowired": false, "secret": false, "defaultValue": "5s", "description": "Sets timeout (in millis) for batch transactions, the value should be 1000 or higher." },
     "transactionCommitStrategy": { "kind": "parameter", "displayName": "Transaction Commit Strategy", "group": "transaction", "label": "transaction", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.TransactionCommitStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the commit strategy." },
     "sharedJMSSession": { "kind": "parameter", "displayName": "Shared JMSSession", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS provi [...]
   }
diff --git a/components/camel-sjms2/src/main/docs/sjms2-component.adoc b/components/camel-sjms2/src/main/docs/sjms2-component.adoc
index 342919f..133a721 100644
--- a/components/camel-sjms2/src/main/docs/sjms2-component.adoc
+++ b/components/camel-sjms2/src/main/docs/sjms2-component.adoc
@@ -93,7 +93,7 @@ You append query options to the URI using the following format,
 
 
 // component options: START
-The Simple JMS2 component supports 19 options, which are listed below.
+The Simple JMS2 component supports 18 options, which are listed below.
 
 
 
@@ -114,7 +114,6 @@ The Simple JMS2 component supports 19 options, which are listed below.
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *jmsKeyFormatStrategy* (advanced) | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The default strategy will safely marshal dots and hyphens (. and -). 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  [...]
 | *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
-| *timedTaskManager* (advanced) | To use a custom TimedTaskManager |  | TimedTaskManager
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *connectionPassword* (security) | The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
 | *connectionUsername* (security) | The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
@@ -149,36 +148,41 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (40 parameters):
+=== Query Parameters (43 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *acknowledgementMode* (common) | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. There are 4 enums and the value can be one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | SessionAcknowledgementType
+| *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message broker [...]
+| *replyTo* (common) | Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer). |  | String
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *consumerCount* (consumer) | Sets the number of consumer listeners used for this endpoint. | 1 | int
 | *durable* (consumer) | Sets topic consumer to durable. | false | boolean
 | *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
 | *reconnectBackOff* (consumer) | Backoff in millis on consumer pool reconnection attempts | 5000 | long
 | *reconnectOnError* (consumer) | Try to apply reconnection logic on consumer pool | true | boolean
+| *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
 | *shared* (consumer) | Sets the consumer to shared. | false | boolean
 | *subscriptionId* (consumer) | Sets the subscription Id, required for durable or shared topics. |  | String
 | *synchronous* (consumer) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | true | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
 | *messageSelector* (consumer) | Sets the JMS Message selector syntax. |  | String
+| *deliveryMode* (producer) | Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2. There are 2 enums and the value can be one of: 1, 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
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *namedReplyTo* (producer) | Sets the reply to destination name used for InOut producer endpoints. The type of the reply to destination can be determined by the starting prefix (topic: or queue:) in its name. |  | String
-| *persistent* (producer) | Flag used to enable/disable message persistence. | true | boolean
-| *producerCount* (producer) | Sets the number of producers used for this endpoint. | 1 | int
-| *ttl* (producer) | Flag used to adjust the Time To Live value of produced messages. | -1 | long
+| *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
+| *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
+| *replyToOverride* (producer) | Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination. |  | String
+| *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
 | *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
-| *prefillPool* (producer) | Whether to prefill the producer connection pool on startup, or create connections lazy when needed. | true | boolean
-| *responseTimeOut* (producer) | Sets the amount of time we should wait before timing out a InOut response. | 5s | long
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
-| *connectionCount* (advanced) | The maximum number of connections available to this endpoint |  | Integer
+| *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
 | *connectionFactory* (advanced) | Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any |  | ConnectionFactory
 | *connectionResource* (advanced) | Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any |  | ConnectionResource
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
@@ -191,8 +195,6 @@ with the following path and query parameters:
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
-| *transactionBatchCount* (transaction) | *Deprecated* If transacted sets the number of messages to process before committing a transaction. | -1 | int
-| *transactionBatchTimeout* (transaction) | *Deprecated* Sets timeout (in millis) for batch transactions, the value should be 1000 or higher. | 5s | long
 | *transactionCommitStrategy* (transaction) | Sets the commit strategy. |  | TransactionCommitStrategy
 | *sharedJMSSession* (transaction) | Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS providers, use jms component to leverage XA transaction. | true | boolean
 |===
@@ -256,13 +258,13 @@ from("direct:start")
     .to("sjms2:queue:bar?exchangePattern=InOut");
 ----
 
-You can specify a `namedReplyTo` though which can provide a better
+You can specify a `replyTo` though which can provide a better
 monitor point.
 
 [source,java]
 ----
 from("direct:start")
-    .to("sjms2:queue:bar?exchangePattern=InOut&namedReplyTo=my.reply.to.queue");
+    .to("sjms2:queue:bar?replyTo=my.reply.to.queue");
 ----
 
 == Consumer Usage
@@ -570,17 +572,13 @@ Transaction API (JTA).
 
 === Does Springless Mean I Can't Use Spring?
 
-Not at all. Below is an example of the SJMS2 component using the Spring
-DSL:
+Not at all. Below is an example of the SJMS2 component using the XML DSL:
 
-[source,java]
+[source,xml]
 ----
-<route
-    id="inout.named.reply.to.producer.route">
-    <from
-        uri="direct:invoke.named.reply.to.queue" />
-    <to
-        uri="sjms2:queue:named.reply.to.queue?namedReplyTo=my.response.queue&amp;exchangePattern=InOut" />
+<route>
+    <from uri="direct:invoke.named.reply.to.queue" />
+    <to uri="sjms2:queue:named.reply.to.queue?replyTo=my.response.queue" />
 </route>
 ----
 
diff --git a/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/jms/Jms2ObjectFactory.java b/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/jms/Jms2ObjectFactory.java
index 302d07c..1a11567 100644
--- a/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/jms/Jms2ObjectFactory.java
+++ b/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/jms/Jms2ObjectFactory.java
@@ -171,14 +171,24 @@ public class Jms2ObjectFactory implements JmsObjectFactory {
         }
     }
 
+    public MessageProducer createMessageProducer(Session session, Endpoint endpoint) throws Exception {
+        Sjms2Endpoint sjms2Endpoint = (Sjms2Endpoint) endpoint;
+        return createMessageProducer(session, endpoint, sjms2Endpoint.getDestinationName());
+    }
+
     @Override
-    public MessageProducer createMessageProducer(Session session, Endpoint endpoint)
+    public MessageProducer createMessageProducer(Session session, Endpoint endpoint, String destinationName)
             throws Exception {
         Sjms2Endpoint sjms2Endpoint = (Sjms2Endpoint) endpoint;
         Destination destination = sjms2Endpoint.getDestinationCreationStrategy().createDestination(session,
-                sjms2Endpoint.getDestinationName(), sjms2Endpoint.isTopic());
+                destinationName, sjms2Endpoint.isTopic());
+
+        boolean persistent = sjms2Endpoint.isDeliveryPersistent();
+        if (sjms2Endpoint.getDeliveryMode() != null) {
+            persistent = DeliveryMode.PERSISTENT == sjms2Endpoint.getDeliveryMode();
+        }
 
-        return createMessageProducer(session, destination, sjms2Endpoint.isPersistent(), sjms2Endpoint.getTtl());
+        return createMessageProducer(session, destination, persistent, sjms2Endpoint.getTimeToLive());
     }
 
     @Override
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
index df22235..a0cdef64 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.sjms2;
 
-import javax.jms.ConnectionFactory;
-
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
@@ -37,10 +35,6 @@ public class Sjms2ComponentRestartTest extends CamelTestSupport {
 
     @Test
     public void testRestartWithStopStart() throws Exception {
-        Sjms2Component sjms2Component = new Sjms2Component();
-        sjms2Component.setConnectionFactory((ConnectionFactory) context.getRegistry().lookupByName("activemqCF"));
-        context.addComponent("sjms2", sjms2Component);
-
         RouteBuilder routeBuilder = new RouteBuilder(context) {
             @Override
             public void configure() throws Exception {
@@ -58,8 +52,7 @@ public class Sjms2ComponentRestartTest extends CamelTestSupport {
         // restart
         context.stop();
 
-        // must add our custom component back again
-        context.addComponent("sjms2", sjms2Component);
+        resetMocks();
 
         context.start();
 
@@ -75,10 +68,6 @@ public class Sjms2ComponentRestartTest extends CamelTestSupport {
 
     @Test
     public void testRestartWithSuspendResume() throws Exception {
-        Sjms2Component sjms2Component = new Sjms2Component();
-        sjms2Component.setConnectionFactory((ConnectionFactory) context.getRegistry().lookupByName("activemqCF"));
-        context.addComponent("sjms2", sjms2Component);
-
         RouteBuilder routeBuilder = new RouteBuilder(context) {
             @Override
             public void configure() throws Exception {
@@ -95,6 +84,7 @@ public class Sjms2ComponentRestartTest extends CamelTestSupport {
 
         // restart
         context.suspend();
+        resetMocks();
         context.resume();
 
         getMockEndpoint("mock:test").expectedMessageCount(1);
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java
index 382084e..fa9f377 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java
@@ -23,12 +23,7 @@ import org.apache.camel.ExchangePattern;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class Sjms2EndpointTest extends CamelTestSupport {
 
@@ -82,13 +77,13 @@ public class Sjms2EndpointTest extends CamelTestSupport {
     }
 
     @Test
-    public void testNamedReplyTo() throws Exception {
-        String namedReplyTo = "reply.to.queue";
-        Endpoint endpoint = context.getEndpoint("sjms2:queue:test?namedReplyTo=" + namedReplyTo);
+    public void testReplyTo() throws Exception {
+        String replyTo = "reply.to.queue";
+        Endpoint endpoint = context.getEndpoint("sjms2:queue:test?replyTo=" + replyTo);
         assertNotNull(endpoint);
         assertTrue(endpoint instanceof Sjms2Endpoint);
         Sjms2Endpoint qe = (Sjms2Endpoint) endpoint;
-        assertEquals(qe.getNamedReplyTo(), namedReplyTo);
+        assertEquals(qe.getReplyTo(), replyTo);
         assertEquals(qe.createExchange().getPattern(), ExchangePattern.InOut);
     }
 
@@ -127,25 +122,18 @@ public class Sjms2EndpointTest extends CamelTestSupport {
     }
 
     @Test
-    public void testNamedReplyToAndMEPMatch() throws Exception {
-        String namedReplyTo = "reply.to.queue";
+    public void testReplyToAndMEPMatch() throws Exception {
+        String replyTo = "reply.to.queue";
         Endpoint endpoint = context
-                .getEndpoint("sjms2:queue:test?namedReplyTo=" + namedReplyTo + "&exchangePattern=" + ExchangePattern.InOut);
+                .getEndpoint("sjms2:queue:test?replyTo=" + replyTo + "&exchangePattern=" + ExchangePattern.InOut);
         assertNotNull(endpoint);
         assertTrue(endpoint instanceof Sjms2Endpoint);
         Sjms2Endpoint qe = (Sjms2Endpoint) endpoint;
-        assertEquals(qe.getNamedReplyTo(), namedReplyTo);
+        assertEquals(qe.getReplyTo(), replyTo);
         assertEquals(qe.createExchange().getPattern(), ExchangePattern.InOut);
     }
 
     @Test
-    public void testNamedReplyToAndMEPMismatch() throws Exception {
-        assertThrows(Exception.class,
-                () -> context
-                        .getEndpoint("sjms2:queue:test?namedReplyTo=reply.to.queue&exchangePattern=" + ExchangePattern.InOnly));
-    }
-
-    @Test
     public void testDestinationName() throws Exception {
         Endpoint endpoint = context.getEndpoint("sjms2:queue:test?synchronous=true");
         assertNotNull(endpoint);
@@ -154,42 +142,6 @@ public class Sjms2EndpointTest extends CamelTestSupport {
         assertTrue(qe.isSynchronous());
     }
 
-    @Test
-    public void testTransactedBatchCountDefault() throws Exception {
-        Endpoint endpoint = context.getEndpoint("sjms2:queue:test?transacted=true");
-        assertNotNull(endpoint);
-        assertTrue(endpoint instanceof Sjms2Endpoint);
-        Sjms2Endpoint qe = (Sjms2Endpoint) endpoint;
-        assertTrue(qe.getTransactionBatchCount() == -1);
-    }
-
-    @Test
-    public void testTransactedBatchCountModified() throws Exception {
-        Endpoint endpoint = context.getEndpoint("sjms2:queue:test?transacted=true&transactionBatchCount=10");
-        assertNotNull(endpoint);
-        assertTrue(endpoint instanceof Sjms2Endpoint);
-        Sjms2Endpoint qe = (Sjms2Endpoint) endpoint;
-        assertTrue(qe.getTransactionBatchCount() == 10);
-    }
-
-    @Test
-    public void testTransactedBatchTimeoutDefault() throws Exception {
-        Endpoint endpoint = context.getEndpoint("sjms2:queue:test?transacted=true");
-        assertNotNull(endpoint);
-        assertTrue(endpoint instanceof Sjms2Endpoint);
-        Sjms2Endpoint qe = (Sjms2Endpoint) endpoint;
-        assertTrue(qe.getTransactionBatchTimeout() == 5000);
-    }
-
-    @Test
-    public void testTransactedBatchTimeoutModified() throws Exception {
-        Endpoint endpoint = context.getEndpoint("sjms2:queue:test?transacted=true&transactionBatchTimeout=3000");
-        assertNotNull(endpoint);
-        assertTrue(endpoint instanceof Sjms2Endpoint);
-        Sjms2Endpoint qe = (Sjms2Endpoint) endpoint;
-        assertTrue(qe.getTransactionBatchTimeout() == 3000);
-    }
-
     @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyQueueProducerTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyQueueProducerTest.java
index 48b1d30..ac59fa2 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyQueueProducerTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyQueueProducerTest.java
@@ -35,11 +35,6 @@ public class InOnlyQueueProducerTest extends Jms2TestSupport {
     public InOnlyQueueProducerTest() {
     }
 
-    @Override
-    protected boolean useJmx() {
-        return false;
-    }
-
     @Test
     public void testInOnlyQueueProducer() throws Exception {
         MessageConsumer mc = createQueueConsumer(TEST_DESTINATION_NAME);
@@ -66,12 +61,6 @@ public class InOnlyQueueProducerTest extends Jms2TestSupport {
 
     }
 
-    /**
-     * @see              org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
-     *
-     * @return
-     * @throws Exception
-     */
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java
index 85a993d..851ed58 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java
@@ -61,13 +61,11 @@ public class Jms2TestSupport extends CamelTestSupport {
     private Session session;
     private DestinationCreationStrategy destinationCreationStrategy = new DefaultDestinationCreationStrategy();
 
-    /**
-     * Set up the Broker
-     *
-     * @see              CamelTestSupport#doPreSetup()
-     *
-     * @throws Exception
-     */
+    @Override
+    protected boolean useJmx() {
+        return false;
+    }
+
     @Override
     protected void doPreSetup() throws Exception {
         broker = new EmbeddedActiveMQ();
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 4e78735..0f2a8ff 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -3975,20 +3975,6 @@ public interface ComponentsBuilderFactory {
         return org.apache.camel.builder.component.dsl.SjmsComponentBuilderFactory.sjms();
     }
     /**
-     * Simple JMS Batch (camel-sjms)
-     * Highly performant and transactional batch consumption of messages from a
-     * JMS queue.
-     * 
-     * Category: messaging
-     * Since: 2.16
-     * Maven coordinates: org.apache.camel:camel-sjms
-     * 
-     * @return the dsl builder
-     */
-    static org.apache.camel.builder.component.dsl.SjmsBatchComponentBuilderFactory.SjmsBatchComponentBuilder sjmsBatch() {
-        return org.apache.camel.builder.component.dsl.SjmsBatchComponentBuilderFactory.sjmsBatch();
-    }
-    /**
      * Simple JMS2 (camel-sjms2)
      * Send and receive messages to/from a JMS Queue or Topic using plain JMS
      * 2.x API.
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java
index 17af484..335d5cf 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java
@@ -733,7 +733,7 @@ public interface JmsComponentBuilderFactory {
         }
         /**
          * Values greater than 1 specify the message priority when sending
-         * (where 0 is the lowest priority and 9 is the highest). The
+         * (where 1 is the lowest priority and 9 is the highest). The
          * explicitQosEnabled option must also be enabled in order for this
          * option to have any effect.
          * 
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java
index 5ddffe8..f3ee320 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java
@@ -308,22 +308,6 @@ public interface Sjms2ComponentBuilderFactory {
             return this;
         }
         /**
-         * To use a custom TimedTaskManager.
-         * 
-         * The option is a:
-         * &lt;code&gt;org.apache.camel.component.sjms.taskmanager.TimedTaskManager&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param timedTaskManager the value to set
-         * @return the dsl builder
-         */
-        default Sjms2ComponentBuilder timedTaskManager(
-                org.apache.camel.component.sjms.taskmanager.TimedTaskManager timedTaskManager) {
-            doSetProperty("timedTaskManager", timedTaskManager);
-            return this;
-        }
-        /**
          * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
          * header to and from Camel message.
          * 
@@ -423,7 +407,6 @@ public interface Sjms2ComponentBuilderFactory {
             case "destinationCreationStrategy": ((Sjms2Component) component).setDestinationCreationStrategy((org.apache.camel.component.sjms.jms.DestinationCreationStrategy) value); return true;
             case "jmsKeyFormatStrategy": ((Sjms2Component) component).setJmsKeyFormatStrategy((org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy) value); return true;
             case "messageCreatedStrategy": ((Sjms2Component) component).setMessageCreatedStrategy((org.apache.camel.component.sjms.jms.MessageCreatedStrategy) value); return true;
-            case "timedTaskManager": ((Sjms2Component) component).setTimedTaskManager((org.apache.camel.component.sjms.taskmanager.TimedTaskManager) value); return true;
             case "headerFilterStrategy": ((Sjms2Component) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
             case "connectionPassword": ((Sjms2Component) component).setConnectionPassword((java.lang.String) value); return true;
             case "connectionUsername": ((Sjms2Component) component).setConnectionUsername((java.lang.String) value); return true;
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsBatchComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsBatchComponentBuilderFactory.java
deleted file mode 100644
index 77080ea..0000000
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsBatchComponentBuilderFactory.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.builder.component.dsl;
-
-import javax.annotation.Generated;
-import org.apache.camel.Component;
-import org.apache.camel.builder.component.AbstractComponentBuilder;
-import org.apache.camel.builder.component.ComponentBuilder;
-import org.apache.camel.component.sjms.batch.SjmsBatchComponent;
-
-/**
- * Highly performant and transactional batch consumption of messages from a JMS
- * queue.
- * 
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.ComponentDslMojo")
-public interface SjmsBatchComponentBuilderFactory {
-
-    /**
-     * Simple JMS Batch (camel-sjms)
-     * Highly performant and transactional batch consumption of messages from a
-     * JMS queue.
-     * 
-     * Category: messaging
-     * Since: 2.16
-     * Maven coordinates: org.apache.camel:camel-sjms
-     * 
-     * @return the dsl builder
-     */
-    static SjmsBatchComponentBuilder sjmsBatch() {
-        return new SjmsBatchComponentBuilderImpl();
-    }
-
-    /**
-     * Builder for the Simple JMS Batch component.
-     */
-    interface SjmsBatchComponentBuilder
-            extends
-                ComponentBuilder<SjmsBatchComponent> {
-        /**
-         * Allows for bridging the consumer to the Camel routing Error Handler,
-         * which mean any exceptions occurred while the consumer is trying to
-         * pickup incoming messages, or the likes, will now be processed as a
-         * message and handled by the routing Error Handler. By default the
-         * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
-         * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: consumer
-         * 
-         * @param bridgeErrorHandler the value to set
-         * @return the dsl builder
-         */
-        default SjmsBatchComponentBuilder bridgeErrorHandler(
-                boolean bridgeErrorHandler) {
-            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
-            return this;
-        }
-        /**
-         * Whether to startup the consumer message listener asynchronously, when
-         * starting a route. For example if a JmsConsumer cannot get a
-         * connection to a remote JMS broker, then it may block while retrying
-         * and/or failover. This will cause Camel to block while starting
-         * routes. By setting this option to true, you will let routes startup,
-         * while the JmsConsumer connects to the JMS broker using a dedicated
-         * thread in asynchronous mode. If this option is used, then beware that
-         * if the connection could not be established, then an exception is
-         * logged at WARN level, and the consumer will not be able to receive
-         * messages; You can then restart the route to retry.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: advanced
-         * 
-         * @param asyncStartListener the value to set
-         * @return the dsl builder
-         */
-        default SjmsBatchComponentBuilder asyncStartListener(
-                boolean asyncStartListener) {
-            doSetProperty("asyncStartListener", asyncStartListener);
-            return this;
-        }
-        /**
-         * Whether autowiring is enabled. This is used for automatic autowiring
-         * options (the option must be marked as autowired) by looking up in the
-         * registry to find if there is a single instance of matching type,
-         * which then gets configured on the component. This can be used for
-         * automatic configuring JDBC data sources, JMS connection factories,
-         * AWS Clients, etc.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: advanced
-         * 
-         * @param autowiredEnabled the value to set
-         * @return the dsl builder
-         */
-        default SjmsBatchComponentBuilder autowiredEnabled(
-                boolean autowiredEnabled) {
-            doSetProperty("autowiredEnabled", autowiredEnabled);
-            return this;
-        }
-        /**
-         * A ConnectionFactory is required to enable the SjmsBatchComponent.
-         * 
-         * The option is a: &lt;code&gt;javax.jms.ConnectionFactory&lt;/code&gt;
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionFactory the value to set
-         * @return the dsl builder
-         */
-        default SjmsBatchComponentBuilder connectionFactory(
-                javax.jms.ConnectionFactory connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
-         * Specifies the interval between recovery attempts, i.e. when a
-         * connection is being refreshed, in milliseconds. The default is 5000
-         * ms, that is, 5 seconds.
-         * 
-         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
-         * 
-         * Default: 5000
-         * Group: advanced
-         * 
-         * @param recoveryInterval the value to set
-         * @return the dsl builder
-         */
-        default SjmsBatchComponentBuilder recoveryInterval(int recoveryInterval) {
-            doSetProperty("recoveryInterval", recoveryInterval);
-            return this;
-        }
-        /**
-         * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
-         * header to and from Camel message.
-         * 
-         * The option is a:
-         * &lt;code&gt;org.apache.camel.spi.HeaderFilterStrategy&lt;/code&gt;
-         * type.
-         * 
-         * Group: filter
-         * 
-         * @param headerFilterStrategy the value to set
-         * @return the dsl builder
-         */
-        default SjmsBatchComponentBuilder headerFilterStrategy(
-                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
-            doSetProperty("headerFilterStrategy", headerFilterStrategy);
-            return this;
-        }
-    }
-
-    class SjmsBatchComponentBuilderImpl
-            extends
-                AbstractComponentBuilder<SjmsBatchComponent>
-            implements
-                SjmsBatchComponentBuilder {
-        @Override
-        protected SjmsBatchComponent buildConcreteComponent() {
-            return new SjmsBatchComponent();
-        }
-        @Override
-        protected boolean setPropertyOnComponent(
-                Component component,
-                String name,
-                Object value) {
-            switch (name) {
-            case "bridgeErrorHandler": ((SjmsBatchComponent) component).setBridgeErrorHandler((boolean) value); return true;
-            case "asyncStartListener": ((SjmsBatchComponent) component).setAsyncStartListener((boolean) value); return true;
-            case "autowiredEnabled": ((SjmsBatchComponent) component).setAutowiredEnabled((boolean) value); return true;
-            case "connectionFactory": ((SjmsBatchComponent) component).setConnectionFactory((javax.jms.ConnectionFactory) value); return true;
-            case "recoveryInterval": ((SjmsBatchComponent) component).setRecoveryInterval((int) value); return true;
-            case "headerFilterStrategy": ((SjmsBatchComponent) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
-            default: return false;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java
index 7e75d72..a20f612 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java
@@ -307,22 +307,6 @@ public interface SjmsComponentBuilderFactory {
             return this;
         }
         /**
-         * To use a custom TimedTaskManager.
-         * 
-         * The option is a:
-         * &lt;code&gt;org.apache.camel.component.sjms.taskmanager.TimedTaskManager&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param timedTaskManager the value to set
-         * @return the dsl builder
-         */
-        default SjmsComponentBuilder timedTaskManager(
-                org.apache.camel.component.sjms.taskmanager.TimedTaskManager timedTaskManager) {
-            doSetProperty("timedTaskManager", timedTaskManager);
-            return this;
-        }
-        /**
          * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
          * header to and from Camel message.
          * 
@@ -422,7 +406,6 @@ public interface SjmsComponentBuilderFactory {
             case "destinationCreationStrategy": ((SjmsComponent) component).setDestinationCreationStrategy((org.apache.camel.component.sjms.jms.DestinationCreationStrategy) value); return true;
             case "jmsKeyFormatStrategy": ((SjmsComponent) component).setJmsKeyFormatStrategy((org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy) value); return true;
             case "messageCreatedStrategy": ((SjmsComponent) component).setMessageCreatedStrategy((org.apache.camel.component.sjms.jms.MessageCreatedStrategy) value); return true;
-            case "timedTaskManager": ((SjmsComponent) component).setTimedTaskManager((org.apache.camel.component.sjms.taskmanager.TimedTaskManager) value); return true;
             case "headerFilterStrategy": ((SjmsComponent) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
             case "connectionPassword": ((SjmsComponent) component).setConnectionPassword((java.lang.String) value); return true;
             case "connectionUsername": ((SjmsComponent) component).setConnectionUsername((java.lang.String) value); return true;
diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json b/core/camel-componentdsl/src/generated/resources/metadata.json
index 40c422b..7e644da 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -6560,28 +6560,6 @@
     "producerOnly": false,
     "lenientProperties": false
   },
-  "SjmsBatchComponentBuilderFactory": {
-    "kind": "component",
-    "name": "sjms-batch",
-    "title": "Simple JMS Batch",
-    "description": "Highly performant and transactional batch consumption of messages from a JMS queue.",
-    "deprecated": false,
-    "firstVersion": "2.16.0",
-    "label": "messaging",
-    "javaType": "org.apache.camel.component.sjms.batch.SjmsBatchComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-sjms",
-    "version": "3.8.0-SNAPSHOT",
-    "scheme": "sjms-batch",
-    "extendsScheme": "",
-    "syntax": "sjms-batch:destinationName",
-    "async": false,
-    "api": false,
-    "consumerOnly": true,
-    "producerOnly": false,
-    "lenientProperties": false
-  },
   "SjmsComponentBuilderFactory": {
     "kind": "component",
     "name": "sjms",
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
index ffa4d13..47aa883 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
@@ -3039,7 +3039,7 @@ public interface JmsEndpointBuilderFactory {
         }
         /**
          * Values greater than 1 specify the message priority when sending
-         * (where 0 is the lowest priority and 9 is the highest). The
+         * (where 1 is the lowest priority and 9 is the highest). The
          * explicitQosEnabled option must also be enabled in order for this
          * option to have any effect.
          * 
@@ -3057,7 +3057,7 @@ public interface JmsEndpointBuilderFactory {
         }
         /**
          * Values greater than 1 specify the message priority when sending
-         * (where 0 is the lowest priority and 9 is the highest). The
+         * (where 1 is the lowest priority and 9 is the highest). The
          * explicitQosEnabled option must also be enabled in order for this
          * option to have any effect.
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java
index b48e79a..3d72324 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java
@@ -81,6 +81,68 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies whether Camel ignores the JMSReplyTo header in messages. If
+         * true, Camel does not send a reply back to the destination specified
+         * in the JMSReplyTo header. You can use this option if you want Camel
+         * to consume from a route and you do not want Camel to automatically
+         * send back a reply message because another component in your code
+         * handles the reply message. You can also use this option if you want
+         * to use Camel as a proxy between different message brokers and you
+         * want to route message from one system to another.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param disableReplyTo the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointConsumerBuilder disableReplyTo(
+                boolean disableReplyTo) {
+            doSetProperty("disableReplyTo", disableReplyTo);
+            return this;
+        }
+        /**
+         * Specifies whether Camel ignores the JMSReplyTo header in messages. If
+         * true, Camel does not send a reply back to the destination specified
+         * in the JMSReplyTo header. You can use this option if you want Camel
+         * to consume from a route and you do not want Camel to automatically
+         * send back a reply message because another component in your code
+         * handles the reply message. You can also use this option if you want
+         * to use Camel as a proxy between different message brokers and you
+         * want to route message from one system to another.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param disableReplyTo the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointConsumerBuilder disableReplyTo(
+                String disableReplyTo) {
+            doSetProperty("disableReplyTo", disableReplyTo);
+            return this;
+        }
+        /**
+         * Provides an explicit ReplyTo destination (overrides any incoming
+         * value of Message.getJMSReplyTo() in consumer).
+         * 
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
+         * 
+         * Group: common
+         * 
+         * @param replyTo the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointConsumerBuilder replyTo(String replyTo) {
+            doSetProperty("replyTo", replyTo);
+            return this;
+        }
+        /**
          * Allows for bridging the consumer to the Camel routing Error Handler,
          * which mean any exceptions occurred while the consumer is trying to
          * pickup incoming messages, or the likes, will now be processed as a
@@ -267,6 +329,39 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies whether to use persistent delivery by default for replies.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: true
+         * Group: consumer
+         * 
+         * @param replyToDeliveryPersistent the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointConsumerBuilder replyToDeliveryPersistent(
+                boolean replyToDeliveryPersistent) {
+            doSetProperty("replyToDeliveryPersistent", replyToDeliveryPersistent);
+            return this;
+        }
+        /**
+         * Specifies whether to use persistent delivery by default for replies.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: true
+         * Group: consumer
+         * 
+         * @param replyToDeliveryPersistent the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointConsumerBuilder replyToDeliveryPersistent(
+                String replyToDeliveryPersistent) {
+            doSetProperty("replyToDeliveryPersistent", replyToDeliveryPersistent);
+            return this;
+        }
+        /**
          * Sets the consumer to shared.
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
@@ -448,78 +543,6 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
-         * If transacted sets the number of messages to process before
-         * committing a transaction.
-         * 
-         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
-         * 
-         * Default: -1
-         * Group: transaction
-         * 
-         * @param transactionBatchCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default Sjms2EndpointConsumerBuilder transactionBatchCount(
-                int transactionBatchCount) {
-            doSetProperty("transactionBatchCount", transactionBatchCount);
-            return this;
-        }
-        /**
-         * If transacted sets the number of messages to process before
-         * committing a transaction.
-         * 
-         * The option will be converted to a &lt;code&gt;int&lt;/code&gt; type.
-         * 
-         * Default: -1
-         * Group: transaction
-         * 
-         * @param transactionBatchCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default Sjms2EndpointConsumerBuilder transactionBatchCount(
-                String transactionBatchCount) {
-            doSetProperty("transactionBatchCount", transactionBatchCount);
-            return this;
-        }
-        /**
-         * Sets timeout (in millis) for batch transactions, the value should be
-         * 1000 or higher.
-         * 
-         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
-         * 
-         * Default: 5s
-         * Group: transaction
-         * 
-         * @param transactionBatchTimeout the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default Sjms2EndpointConsumerBuilder transactionBatchTimeout(
-                long transactionBatchTimeout) {
-            doSetProperty("transactionBatchTimeout", transactionBatchTimeout);
-            return this;
-        }
-        /**
-         * Sets timeout (in millis) for batch transactions, the value should be
-         * 1000 or higher.
-         * 
-         * The option will be converted to a &lt;code&gt;long&lt;/code&gt; type.
-         * 
-         * Default: 5s
-         * Group: transaction
-         * 
-         * @param transactionBatchTimeout the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default Sjms2EndpointConsumerBuilder transactionBatchTimeout(
-                String transactionBatchTimeout) {
-            doSetProperty("transactionBatchTimeout", transactionBatchTimeout);
-            return this;
-        }
-        /**
          * Sets the commit strategy.
          * 
          * The option is a:
@@ -743,6 +766,7 @@ public interface Sjms2EndpointBuilderFactory {
          * @param connectionCount the value to set
          * @return the dsl builder
          */
+        @Deprecated
         default AdvancedSjms2EndpointConsumerBuilder connectionCount(
                 Integer connectionCount) {
             doSetProperty("connectionCount", connectionCount);
@@ -759,6 +783,7 @@ public interface Sjms2EndpointBuilderFactory {
          * @param connectionCount the value to set
          * @return the dsl builder
          */
+        @Deprecated
         default AdvancedSjms2EndpointConsumerBuilder connectionCount(
                 String connectionCount) {
             doSetProperty("connectionCount", connectionCount);
@@ -1181,6 +1206,177 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies whether Camel ignores the JMSReplyTo header in messages. If
+         * true, Camel does not send a reply back to the destination specified
+         * in the JMSReplyTo header. You can use this option if you want Camel
+         * to consume from a route and you do not want Camel to automatically
+         * send back a reply message because another component in your code
+         * handles the reply message. You can also use this option if you want
+         * to use Camel as a proxy between different message brokers and you
+         * want to route message from one system to another.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param disableReplyTo the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder disableReplyTo(
+                boolean disableReplyTo) {
+            doSetProperty("disableReplyTo", disableReplyTo);
+            return this;
+        }
+        /**
+         * Specifies whether Camel ignores the JMSReplyTo header in messages. If
+         * true, Camel does not send a reply back to the destination specified
+         * in the JMSReplyTo header. You can use this option if you want Camel
+         * to consume from a route and you do not want Camel to automatically
+         * send back a reply message because another component in your code
+         * handles the reply message. You can also use this option if you want
+         * to use Camel as a proxy between different message brokers and you
+         * want to route message from one system to another.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param disableReplyTo the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder disableReplyTo(
+                String disableReplyTo) {
+            doSetProperty("disableReplyTo", disableReplyTo);
+            return this;
+        }
+        /**
+         * Provides an explicit ReplyTo destination (overrides any incoming
+         * value of Message.getJMSReplyTo() in consumer).
+         * 
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
+         * 
+         * Group: common
+         * 
+         * @param replyTo the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder replyTo(String replyTo) {
+            doSetProperty("replyTo", replyTo);
+            return this;
+        }
+        /**
+         * Specifies the delivery mode to be used. Possible values are those
+         * defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT
+         * = 2.
+         * 
+         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
+         * 
+         * Group: producer
+         * 
+         * @param deliveryMode the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder deliveryMode(Integer deliveryMode) {
+            doSetProperty("deliveryMode", deliveryMode);
+            return this;
+        }
+        /**
+         * Specifies the delivery mode to be used. Possible values are those
+         * defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT
+         * = 2.
+         * 
+         * The option will be converted to a
+         * &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
+         * 
+         * Group: producer
+         * 
+         * @param deliveryMode the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder deliveryMode(String deliveryMode) {
+            doSetProperty("deliveryMode", deliveryMode);
+            return this;
+        }
+        /**
+         * Specifies whether persistent delivery is used by default.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: true
+         * Group: producer
+         * 
+         * @param deliveryPersistent the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder deliveryPersistent(
+                boolean deliveryPersistent) {
+            doSetProperty("deliveryPersistent", deliveryPersistent);
+            return this;
+        }
+        /**
+         * Specifies whether persistent delivery is used by default.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: true
+         * Group: producer
+         * 
+         * @param deliveryPersistent the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder deliveryPersistent(
+                String deliveryPersistent) {
+            doSetProperty("deliveryPersistent", deliveryPersistent);
+            return this;
+        }
+        /**
+         * 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.
+         * 
+         * The option is a: &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: producer
+         * 
+         * @param explicitQosEnabled the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder explicitQosEnabled(
+                Boolean explicitQosEnabled) {
+            doSetProperty("explicitQosEnabled", explicitQosEnabled);
+            return this;
+        }
+        /**
+         * 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.
+         * 
+         * The option will be converted to a
+         * &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: producer
+         * 
+         * @param explicitQosEnabled the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder explicitQosEnabled(
+                String explicitQosEnabled) {
+            doSetProperty("explicitQosEnabled", explicitQosEnabled);
+            return this;
+        }
+        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -1230,110 +1426,177 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
-         * Sets the reply to destination name used for InOut producer endpoints.
-         * The type of the reply to destination can be determined by the
-         * starting prefix (topic: or queue:) in its name.
+         * Set to true, if you want to send message using the QoS settings
+         * specified on the message, instead of the QoS settings on the JMS
+         * endpoint. The following three headers are considered JMSPriority,
+         * JMSDeliveryMode, and JMSExpiration. You can provide all or only some
+         * of them. If not provided, Camel will fall back to use the values from
+         * the endpoint instead. So, when using this option, the headers
+         * override the values from the endpoint. The explicitQosEnabled option,
+         * by contrast, will only use options set on the endpoint, and not
+         * values from the message header.
          * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
+         * Default: false
          * Group: producer
          * 
-         * @param namedReplyTo the value to set
+         * @param preserveMessageQos the value to set
          * @return the dsl builder
          */
-        default Sjms2EndpointProducerBuilder namedReplyTo(String namedReplyTo) {
-            doSetProperty("namedReplyTo", namedReplyTo);
+        default Sjms2EndpointProducerBuilder preserveMessageQos(
+                boolean preserveMessageQos) {
+            doSetProperty("preserveMessageQos", preserveMessageQos);
             return this;
         }
         /**
-         * Flag used to enable/disable message persistence.
+         * Set to true, if you want to send message using the QoS settings
+         * specified on the message, instead of the QoS settings on the JMS
+         * endpoint. The following three headers are considered JMSPriority,
+         * JMSDeliveryMode, and JMSExpiration. You can provide all or only some
+         * of them. If not provided, Camel will fall back to use the values from
+         * the endpoint instead. So, when using this option, the headers
+         * override the values from the endpoint. The explicitQosEnabled option,
+         * by contrast, will only use options set on the endpoint, and not
+         * values from the message header.
          * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
-         * @param persistent the value to set
+         * @param preserveMessageQos the value to set
          * @return the dsl builder
          */
-        default Sjms2EndpointProducerBuilder persistent(boolean persistent) {
-            doSetProperty("persistent", persistent);
+        default Sjms2EndpointProducerBuilder preserveMessageQos(
+                String preserveMessageQos) {
+            doSetProperty("preserveMessageQos", preserveMessageQos);
             return this;
         }
         /**
-         * Flag used to enable/disable message persistence.
+         * Values greater than 1 specify the message priority when sending
+         * (where 1 is the lowest priority and 9 is the highest). The
+         * explicitQosEnabled option must also be enabled in order for this
+         * option to have any effect.
          * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: 4
          * Group: producer
          * 
-         * @param persistent the value to set
+         * @param priority the value to set
          * @return the dsl builder
          */
-        default Sjms2EndpointProducerBuilder persistent(String persistent) {
-            doSetProperty("persistent", persistent);
+        default Sjms2EndpointProducerBuilder priority(int priority) {
+            doSetProperty("priority", priority);
             return this;
         }
         /**
-         * Sets the number of producers used for this endpoint.
+         * Values greater than 1 specify the message priority when sending
+         * (where 1 is the lowest priority and 9 is the highest). The
+         * explicitQosEnabled option must also be enabled in order for this
+         * option to have any effect.
          * 
-         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
+         * The option will be converted to a &lt;code&gt;int&lt;/code&gt; type.
          * 
-         * Default: 1
+         * Default: 4
          * Group: producer
          * 
-         * @param producerCount the value to set
+         * @param priority the value to set
          * @return the dsl builder
          */
-        default Sjms2EndpointProducerBuilder producerCount(int producerCount) {
-            doSetProperty("producerCount", producerCount);
+        default Sjms2EndpointProducerBuilder priority(String priority) {
+            doSetProperty("priority", priority);
             return this;
         }
         /**
-         * Sets the number of producers used for this endpoint.
+         * Provides an explicit ReplyTo destination in the JMS message, which
+         * overrides the setting of replyTo. It is useful if you want to forward
+         * the message to a remote Queue and receive the reply message from the
+         * ReplyTo destination.
          * 
-         * The option will be converted to a &lt;code&gt;int&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
-         * Default: 1
          * Group: producer
          * 
-         * @param producerCount the value to set
+         * @param replyToOverride the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder replyToOverride(
+                String replyToOverride) {
+            doSetProperty("replyToOverride", replyToOverride);
+            return this;
+        }
+        /**
+         * 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.
+         * 
+         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 20000
+         * Group: producer
+         * 
+         * @param requestTimeout the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder requestTimeout(long requestTimeout) {
+            doSetProperty("requestTimeout", requestTimeout);
+            return this;
+        }
+        /**
+         * 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.
+         * 
+         * The option will be converted to a &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 20000
+         * Group: producer
+         * 
+         * @param requestTimeout the value to set
          * @return the dsl builder
          */
-        default Sjms2EndpointProducerBuilder producerCount(String producerCount) {
-            doSetProperty("producerCount", producerCount);
+        default Sjms2EndpointProducerBuilder requestTimeout(
+                String requestTimeout) {
+            doSetProperty("requestTimeout", requestTimeout);
             return this;
         }
         /**
-         * Flag used to adjust the Time To Live value of produced messages.
+         * When sending messages, specifies the time-to-live of the message (in
+         * milliseconds).
          * 
          * The option is a: &lt;code&gt;long&lt;/code&gt; type.
          * 
          * Default: -1
          * Group: producer
          * 
-         * @param ttl the value to set
+         * @param timeToLive the value to set
          * @return the dsl builder
          */
-        default Sjms2EndpointProducerBuilder ttl(long ttl) {
-            doSetProperty("ttl", ttl);
+        default Sjms2EndpointProducerBuilder timeToLive(long timeToLive) {
+            doSetProperty("timeToLive", timeToLive);
             return this;
         }
         /**
-         * Flag used to adjust the Time To Live value of produced messages.
+         * When sending messages, specifies the time-to-live of the message (in
+         * milliseconds).
          * 
          * The option will be converted to a &lt;code&gt;long&lt;/code&gt; type.
          * 
          * Default: -1
          * Group: producer
          * 
-         * @param ttl the value to set
+         * @param timeToLive the value to set
          * @return the dsl builder
          */
-        default Sjms2EndpointProducerBuilder ttl(String ttl) {
-            doSetProperty("ttl", ttl);
+        default Sjms2EndpointProducerBuilder timeToLive(String timeToLive) {
+            doSetProperty("timeToLive", timeToLive);
             return this;
         }
         /**
@@ -1446,75 +1709,6 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
-         * Whether to prefill the producer connection pool on startup, or create
-         * connections lazy when needed.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: producer (advanced)
-         * 
-         * @param prefillPool the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointProducerBuilder prefillPool(
-                boolean prefillPool) {
-            doSetProperty("prefillPool", prefillPool);
-            return this;
-        }
-        /**
-         * Whether to prefill the producer connection pool on startup, or create
-         * connections lazy when needed.
-         * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
-         * 
-         * Default: true
-         * Group: producer (advanced)
-         * 
-         * @param prefillPool the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointProducerBuilder prefillPool(
-                String prefillPool) {
-            doSetProperty("prefillPool", prefillPool);
-            return this;
-        }
-        /**
-         * Sets the amount of time we should wait before timing out a InOut
-         * response.
-         * 
-         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
-         * 
-         * Default: 5s
-         * Group: producer (advanced)
-         * 
-         * @param responseTimeOut the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointProducerBuilder responseTimeOut(
-                long responseTimeOut) {
-            doSetProperty("responseTimeOut", responseTimeOut);
-            return this;
-        }
-        /**
-         * Sets the amount of time we should wait before timing out a InOut
-         * response.
-         * 
-         * The option will be converted to a &lt;code&gt;long&lt;/code&gt; type.
-         * 
-         * Default: 5s
-         * Group: producer (advanced)
-         * 
-         * @param responseTimeOut the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointProducerBuilder responseTimeOut(
-                String responseTimeOut) {
-            doSetProperty("responseTimeOut", responseTimeOut);
-            return this;
-        }
-        /**
          * Whether to startup the consumer message listener asynchronously, when
          * starting a route. For example if a JmsConsumer cannot get a
          * connection to a remote JMS broker, then it may block while retrying
@@ -1610,6 +1804,7 @@ public interface Sjms2EndpointBuilderFactory {
          * @param connectionCount the value to set
          * @return the dsl builder
          */
+        @Deprecated
         default AdvancedSjms2EndpointProducerBuilder connectionCount(
                 Integer connectionCount) {
             doSetProperty("connectionCount", connectionCount);
@@ -1626,6 +1821,7 @@ public interface Sjms2EndpointBuilderFactory {
          * @param connectionCount the value to set
          * @return the dsl builder
          */
+        @Deprecated
         default AdvancedSjms2EndpointProducerBuilder connectionCount(
                 String connectionCount) {
             doSetProperty("connectionCount", connectionCount);
@@ -2049,6 +2245,66 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies whether Camel ignores the JMSReplyTo header in messages. If
+         * true, Camel does not send a reply back to the destination specified
+         * in the JMSReplyTo header. You can use this option if you want Camel
+         * to consume from a route and you do not want Camel to automatically
+         * send back a reply message because another component in your code
+         * handles the reply message. You can also use this option if you want
+         * to use Camel as a proxy between different message brokers and you
+         * want to route message from one system to another.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param disableReplyTo the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointBuilder disableReplyTo(boolean disableReplyTo) {
+            doSetProperty("disableReplyTo", disableReplyTo);
+            return this;
+        }
+        /**
+         * Specifies whether Camel ignores the JMSReplyTo header in messages. If
+         * true, Camel does not send a reply back to the destination specified
+         * in the JMSReplyTo header. You can use this option if you want Camel
+         * to consume from a route and you do not want Camel to automatically
+         * send back a reply message because another component in your code
+         * handles the reply message. You can also use this option if you want
+         * to use Camel as a proxy between different message brokers and you
+         * want to route message from one system to another.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param disableReplyTo the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointBuilder disableReplyTo(String disableReplyTo) {
+            doSetProperty("disableReplyTo", disableReplyTo);
+            return this;
+        }
+        /**
+         * Provides an explicit ReplyTo destination (overrides any incoming
+         * value of Message.getJMSReplyTo() in consumer).
+         * 
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
+         * 
+         * Group: common
+         * 
+         * @param replyTo the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointBuilder replyTo(String replyTo) {
+            doSetProperty("replyTo", replyTo);
+            return this;
+        }
+        /**
          * Specifies whether to use transacted mode.
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
@@ -2219,6 +2475,7 @@ public interface Sjms2EndpointBuilderFactory {
          * @param connectionCount the value to set
          * @return the dsl builder
          */
+        @Deprecated
         default AdvancedSjms2EndpointBuilder connectionCount(
                 Integer connectionCount) {
             doSetProperty("connectionCount", connectionCount);
@@ -2235,6 +2492,7 @@ public interface Sjms2EndpointBuilderFactory {
          * @param connectionCount the value to set
          * @return the dsl builder
          */
+        @Deprecated
         default AdvancedSjms2EndpointBuilder connectionCount(
                 String connectionCount) {
             doSetProperty("connectionCount", connectionCount);
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java
index 37925ef..13587e2 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java
@@ -81,6 +81,67 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies whether Camel ignores the JMSReplyTo header in messages. If
+         * true, Camel does not send a reply back to the destination specified
+         * in the JMSReplyTo header. You can use this option if you want Camel
+         * to consume from a route and you do not want Camel to automatically
+         * send back a reply message because another component in your code
+         * handles the reply message. You can also use this option if you want
+         * to use Camel as a proxy between different message brokers and you
+         * want to route message from one system to another.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param disableReplyTo the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointConsumerBuilder disableReplyTo(
+                boolean disableReplyTo) {
+            doSetProperty("disableReplyTo", disableReplyTo);
+            return this;
+        }
+        /**
+         * Specifies whether Camel ignores the JMSReplyTo header in messages. If
+         * true, Camel does not send a reply back to the destination specified
+         * in the JMSReplyTo header. You can use this option if you want Camel
+         * to consume from a route and you do not want Camel to automatically
+         * send back a reply message because another component in your code
+         * handles the reply message. You can also use this option if you want
+         * to use Camel as a proxy between different message brokers and you
+         * want to route message from one system to another.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param disableReplyTo the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointConsumerBuilder disableReplyTo(String disableReplyTo) {
+            doSetProperty("disableReplyTo", disableReplyTo);
+            return this;
+        }
+        /**
+         * Provides an explicit ReplyTo destination (overrides any incoming
+         * value of Message.getJMSReplyTo() in consumer).
+         * 
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
+         * 
+         * Group: common
+         * 
+         * @param replyTo the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointConsumerBuilder replyTo(String replyTo) {
+            doSetProperty("replyTo", replyTo);
+            return this;
+        }
+        /**
          * Allows for bridging the consumer to the Camel routing Error Handler,
          * which mean any exceptions occurred while the consumer is trying to
          * pickup incoming messages, or the likes, will now be processed as a
@@ -236,6 +297,39 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies whether to use persistent delivery by default for replies.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: true
+         * Group: consumer
+         * 
+         * @param replyToDeliveryPersistent the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointConsumerBuilder replyToDeliveryPersistent(
+                boolean replyToDeliveryPersistent) {
+            doSetProperty("replyToDeliveryPersistent", replyToDeliveryPersistent);
+            return this;
+        }
+        /**
+         * Specifies whether to use persistent delivery by default for replies.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: true
+         * Group: consumer
+         * 
+         * @param replyToDeliveryPersistent the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointConsumerBuilder replyToDeliveryPersistent(
+                String replyToDeliveryPersistent) {
+            doSetProperty("replyToDeliveryPersistent", replyToDeliveryPersistent);
+            return this;
+        }
+        /**
          * Sets whether synchronous processing should be strictly used or Camel
          * is allowed to use asynchronous processing (if supported).
          * 
@@ -371,78 +465,6 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
-         * If transacted sets the number of messages to process before
-         * committing a transaction.
-         * 
-         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
-         * 
-         * Default: -1
-         * Group: transaction
-         * 
-         * @param transactionBatchCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default SjmsEndpointConsumerBuilder transactionBatchCount(
-                int transactionBatchCount) {
-            doSetProperty("transactionBatchCount", transactionBatchCount);
-            return this;
-        }
-        /**
-         * If transacted sets the number of messages to process before
-         * committing a transaction.
-         * 
-         * The option will be converted to a &lt;code&gt;int&lt;/code&gt; type.
-         * 
-         * Default: -1
-         * Group: transaction
-         * 
-         * @param transactionBatchCount the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default SjmsEndpointConsumerBuilder transactionBatchCount(
-                String transactionBatchCount) {
-            doSetProperty("transactionBatchCount", transactionBatchCount);
-            return this;
-        }
-        /**
-         * Sets timeout (in millis) for batch transactions, the value should be
-         * 1000 or higher.
-         * 
-         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
-         * 
-         * Default: 5s
-         * Group: transaction
-         * 
-         * @param transactionBatchTimeout the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default SjmsEndpointConsumerBuilder transactionBatchTimeout(
-                long transactionBatchTimeout) {
-            doSetProperty("transactionBatchTimeout", transactionBatchTimeout);
-            return this;
-        }
-        /**
-         * Sets timeout (in millis) for batch transactions, the value should be
-         * 1000 or higher.
-         * 
-         * The option will be converted to a &lt;code&gt;long&lt;/code&gt; type.
-         * 
-         * Default: 5s
-         * Group: transaction
-         * 
-         * @param transactionBatchTimeout the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default SjmsEndpointConsumerBuilder transactionBatchTimeout(
-                String transactionBatchTimeout) {
-            doSetProperty("transactionBatchTimeout", transactionBatchTimeout);
-            return this;
-        }
-        /**
          * Sets the commit strategy.
          * 
          * The option is a:
@@ -666,6 +688,7 @@ public interface SjmsEndpointBuilderFactory {
          * @param connectionCount the value to set
          * @return the dsl builder
          */
+        @Deprecated
         default AdvancedSjmsEndpointConsumerBuilder connectionCount(
                 Integer connectionCount) {
             doSetProperty("connectionCount", connectionCount);
@@ -682,6 +705,7 @@ public interface SjmsEndpointBuilderFactory {
          * @param connectionCount the value to set
          * @return the dsl builder
          */
+        @Deprecated
         default AdvancedSjmsEndpointConsumerBuilder connectionCount(
                 String connectionCount) {
             doSetProperty("connectionCount", connectionCount);
@@ -1104,6 +1128,176 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies whether Camel ignores the JMSReplyTo header in messages. If
+         * true, Camel does not send a reply back to the destination specified
+         * in the JMSReplyTo header. You can use this option if you want Camel
+         * to consume from a route and you do not want Camel to automatically
+         * send back a reply message because another component in your code
+         * handles the reply message. You can also use this option if you want
+         * to use Camel as a proxy between different message brokers and you
+         * want to route message from one system to another.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param disableReplyTo the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointProducerBuilder disableReplyTo(
+                boolean disableReplyTo) {
+            doSetProperty("disableReplyTo", disableReplyTo);
+            return this;
+        }
+        /**
+         * Specifies whether Camel ignores the JMSReplyTo header in messages. If
+         * true, Camel does not send a reply back to the destination specified
+         * in the JMSReplyTo header. You can use this option if you want Camel
+         * to consume from a route and you do not want Camel to automatically
+         * send back a reply message because another component in your code
+         * handles the reply message. You can also use this option if you want
+         * to use Camel as a proxy between different message brokers and you
+         * want to route message from one system to another.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param disableReplyTo the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointProducerBuilder disableReplyTo(String disableReplyTo) {
+            doSetProperty("disableReplyTo", disableReplyTo);
+            return this;
+        }
+        /**
+         * Provides an explicit ReplyTo destination (overrides any incoming
+         * value of Message.getJMSReplyTo() in consumer).
+         * 
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
+         * 
+         * Group: common
+         * 
+         * @param replyTo the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointProducerBuilder replyTo(String replyTo) {
+            doSetProperty("replyTo", replyTo);
+            return this;
+        }
+        /**
+         * Specifies the delivery mode to be used. Possible values are those
+         * defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT
+         * = 2.
+         * 
+         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
+         * 
+         * Group: producer
+         * 
+         * @param deliveryMode the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointProducerBuilder deliveryMode(Integer deliveryMode) {
+            doSetProperty("deliveryMode", deliveryMode);
+            return this;
+        }
+        /**
+         * Specifies the delivery mode to be used. Possible values are those
+         * defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT
+         * = 2.
+         * 
+         * The option will be converted to a
+         * &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
+         * 
+         * Group: producer
+         * 
+         * @param deliveryMode the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointProducerBuilder deliveryMode(String deliveryMode) {
+            doSetProperty("deliveryMode", deliveryMode);
+            return this;
+        }
+        /**
+         * Specifies whether persistent delivery is used by default.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: true
+         * Group: producer
+         * 
+         * @param deliveryPersistent the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointProducerBuilder deliveryPersistent(
+                boolean deliveryPersistent) {
+            doSetProperty("deliveryPersistent", deliveryPersistent);
+            return this;
+        }
+        /**
+         * Specifies whether persistent delivery is used by default.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: true
+         * Group: producer
+         * 
+         * @param deliveryPersistent the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointProducerBuilder deliveryPersistent(
+                String deliveryPersistent) {
+            doSetProperty("deliveryPersistent", deliveryPersistent);
+            return this;
+        }
+        /**
+         * 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.
+         * 
+         * The option is a: &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: producer
+         * 
+         * @param explicitQosEnabled the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointProducerBuilder explicitQosEnabled(
+                Boolean explicitQosEnabled) {
+            doSetProperty("explicitQosEnabled", explicitQosEnabled);
+            return this;
+        }
+        /**
+         * 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.
+         * 
+         * The option will be converted to a
+         * &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: producer
+         * 
+         * @param explicitQosEnabled the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointProducerBuilder explicitQosEnabled(
+                String explicitQosEnabled) {
+            doSetProperty("explicitQosEnabled", explicitQosEnabled);
+            return this;
+        }
+        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -1153,110 +1347,176 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sets the reply to destination name used for InOut producer endpoints.
-         * The type of the reply to destination can be determined by the
-         * starting prefix (topic: or queue:) in its name.
+         * Set to true, if you want to send message using the QoS settings
+         * specified on the message, instead of the QoS settings on the JMS
+         * endpoint. The following three headers are considered JMSPriority,
+         * JMSDeliveryMode, and JMSExpiration. You can provide all or only some
+         * of them. If not provided, Camel will fall back to use the values from
+         * the endpoint instead. So, when using this option, the headers
+         * override the values from the endpoint. The explicitQosEnabled option,
+         * by contrast, will only use options set on the endpoint, and not
+         * values from the message header.
          * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
+         * Default: false
          * Group: producer
          * 
-         * @param namedReplyTo the value to set
+         * @param preserveMessageQos the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointProducerBuilder namedReplyTo(String namedReplyTo) {
-            doSetProperty("namedReplyTo", namedReplyTo);
+        default SjmsEndpointProducerBuilder preserveMessageQos(
+                boolean preserveMessageQos) {
+            doSetProperty("preserveMessageQos", preserveMessageQos);
             return this;
         }
         /**
-         * Flag used to enable/disable message persistence.
+         * Set to true, if you want to send message using the QoS settings
+         * specified on the message, instead of the QoS settings on the JMS
+         * endpoint. The following three headers are considered JMSPriority,
+         * JMSDeliveryMode, and JMSExpiration. You can provide all or only some
+         * of them. If not provided, Camel will fall back to use the values from
+         * the endpoint instead. So, when using this option, the headers
+         * override the values from the endpoint. The explicitQosEnabled option,
+         * by contrast, will only use options set on the endpoint, and not
+         * values from the message header.
          * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
-         * @param persistent the value to set
+         * @param preserveMessageQos the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointProducerBuilder persistent(boolean persistent) {
-            doSetProperty("persistent", persistent);
+        default SjmsEndpointProducerBuilder preserveMessageQos(
+                String preserveMessageQos) {
+            doSetProperty("preserveMessageQos", preserveMessageQos);
             return this;
         }
         /**
-         * Flag used to enable/disable message persistence.
+         * Values greater than 1 specify the message priority when sending
+         * (where 1 is the lowest priority and 9 is the highest). The
+         * explicitQosEnabled option must also be enabled in order for this
+         * option to have any effect.
          * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: 4
          * Group: producer
          * 
-         * @param persistent the value to set
+         * @param priority the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointProducerBuilder persistent(String persistent) {
-            doSetProperty("persistent", persistent);
+        default SjmsEndpointProducerBuilder priority(int priority) {
+            doSetProperty("priority", priority);
             return this;
         }
         /**
-         * Sets the number of producers used for this endpoint.
+         * Values greater than 1 specify the message priority when sending
+         * (where 1 is the lowest priority and 9 is the highest). The
+         * explicitQosEnabled option must also be enabled in order for this
+         * option to have any effect.
          * 
-         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
+         * The option will be converted to a &lt;code&gt;int&lt;/code&gt; type.
          * 
-         * Default: 1
+         * Default: 4
          * Group: producer
          * 
-         * @param producerCount the value to set
+         * @param priority the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointProducerBuilder producerCount(int producerCount) {
-            doSetProperty("producerCount", producerCount);
+        default SjmsEndpointProducerBuilder priority(String priority) {
+            doSetProperty("priority", priority);
             return this;
         }
         /**
-         * Sets the number of producers used for this endpoint.
+         * Provides an explicit ReplyTo destination in the JMS message, which
+         * overrides the setting of replyTo. It is useful if you want to forward
+         * the message to a remote Queue and receive the reply message from the
+         * ReplyTo destination.
          * 
-         * The option will be converted to a &lt;code&gt;int&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
-         * Default: 1
          * Group: producer
          * 
-         * @param producerCount the value to set
+         * @param replyToOverride the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointProducerBuilder replyToOverride(
+                String replyToOverride) {
+            doSetProperty("replyToOverride", replyToOverride);
+            return this;
+        }
+        /**
+         * 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.
+         * 
+         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 20000
+         * Group: producer
+         * 
+         * @param requestTimeout the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointProducerBuilder requestTimeout(long requestTimeout) {
+            doSetProperty("requestTimeout", requestTimeout);
+            return this;
+        }
+        /**
+         * 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.
+         * 
+         * The option will be converted to a &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 20000
+         * Group: producer
+         * 
+         * @param requestTimeout the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointProducerBuilder producerCount(String producerCount) {
-            doSetProperty("producerCount", producerCount);
+        default SjmsEndpointProducerBuilder requestTimeout(String requestTimeout) {
+            doSetProperty("requestTimeout", requestTimeout);
... 767 lines suppressed ...


[camel] 05/07: camel-main - Remove option that was removed

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 870974285dae1d5d41c8f98c8fb3360093a39e7e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 6 07:47:59 2021 +0100

    camel-main - Remove option that was removed
---
 .../MainConfigurationPropertiesConfigurer.java     |  6 -----
 .../camel-main-configuration-metadata.json         |  1 -
 core/camel-main/src/main/docs/main.adoc            |  1 -
 .../camel/main/DefaultConfigurationProperties.java | 26 ----------------------
 4 files changed, 34 deletions(-)

diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
index c91005f..28ced68 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
@@ -59,8 +59,6 @@ public class MainConfigurationPropertiesConfigurer extends org.apache.camel.supp
         case "DurationMaxMessages": target.setDurationMaxMessages(property(camelContext, int.class, value)); return true;
         case "durationmaxseconds":
         case "DurationMaxSeconds": target.setDurationMaxSeconds(property(camelContext, int.class, value)); return true;
-        case "endpointbasicpropertybinding":
-        case "EndpointBasicPropertyBinding": target.setEndpointBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
         case "endpointbridgeerrorhandler":
         case "EndpointBridgeErrorHandler": target.setEndpointBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
         case "endpointlazystartproducer":
@@ -228,8 +226,6 @@ public class MainConfigurationPropertiesConfigurer extends org.apache.camel.supp
         case "DurationMaxMessages": return int.class;
         case "durationmaxseconds":
         case "DurationMaxSeconds": return int.class;
-        case "endpointbasicpropertybinding":
-        case "EndpointBasicPropertyBinding": return boolean.class;
         case "endpointbridgeerrorhandler":
         case "EndpointBridgeErrorHandler": return boolean.class;
         case "endpointlazystartproducer":
@@ -398,8 +394,6 @@ public class MainConfigurationPropertiesConfigurer extends org.apache.camel.supp
         case "DurationMaxMessages": return target.getDurationMaxMessages();
         case "durationmaxseconds":
         case "DurationMaxSeconds": return target.getDurationMaxSeconds();
-        case "endpointbasicpropertybinding":
-        case "EndpointBasicPropertyBinding": return target.isEndpointBasicPropertyBinding();
         case "endpointbridgeerrorhandler":
         case "EndpointBridgeErrorHandler": return target.isEndpointBridgeErrorHandler();
         case "endpointlazystartproducer":
diff --git a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
index bf887d8..7a249fd 100644
--- a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
+++ b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
@@ -29,7 +29,6 @@
     { "name": "camel.main.durationMaxIdleSeconds", "description": "To specify for how long time in seconds Camel can be idle before automatic terminating the JVM. You can use this to run Camel for a short while.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "integer", "javaType": "int" },
     { "name": "camel.main.durationMaxMessages", "description": "To specify how many messages to process by Camel before automatic terminating the JVM. You can use this to run Camel for a short while.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "integer", "javaType": "int" },
     { "name": "camel.main.durationMaxSeconds", "description": "To specify for how long time in seconds to keep running the JVM before automatic terminating the JVM. You can use this to run Camel for a short while.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "integer", "javaType": "int" },
-    { "name": "camel.main.endpointBasicPropertyBinding", "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities. The default value is false.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", "javaType": "boolean" },
     { "name": "camel.main.endpointBridgeErrorHandler", "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN\/ERROR level and ignored. The default va [...]
     { "name": "camel.main.endpointLazyStartProducer", "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first mes [...]
     { "name": "camel.main.endpointRuntimeStatisticsEnabled", "description": "Sets whether endpoint runtime statistics is enabled (gathers runtime usage of each incoming and outgoing endpoints). The default value is false.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", "javaType": "boolean" },
diff --git a/core/camel-main/src/main/docs/main.adoc b/core/camel-main/src/main/docs/main.adoc
index 886b941..32177f1 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -41,7 +41,6 @@ The following table lists all the options:
 | *camel.main.durationMaxIdle{zwsp}Seconds* | To specify for how long time in seconds Camel can be idle before automatic terminating the JVM. You can use this to run Camel for a short while. |  | int
 | *camel.main.durationMaxMessages* | To specify how many messages to process by Camel before automatic terminating the JVM. You can use this to run Camel for a short while. |  | int
 | *camel.main.durationMaxSeconds* | To specify for how long time in seconds to keep running the JVM before automatic terminating the JVM. You can use this to run Camel for a short while. |  | int
-| *camel.main.endpointBasic{zwsp}PropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities. The default value is false. |  | boolean
 | *camel.main.endpointBridgeError{zwsp}Handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN/ERROR level and ignored. The default value is false. |  | boolean
 | *camel.main.endpointLazyStart{zwsp}Producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.main.endpointRuntime{zwsp}StatisticsEnabled* | Sets whether endpoint runtime statistics is enabled (gathers runtime usage of each incoming and outgoing endpoints). The default value is false. |  | boolean
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
index 2a47ca3..44de80a 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
@@ -66,7 +66,6 @@ public abstract class DefaultConfigurationProperties<T> {
     private boolean endpointRuntimeStatisticsEnabled;
     private boolean endpointLazyStartProducer;
     private boolean endpointBridgeErrorHandler;
-    private boolean endpointBasicPropertyBinding;
     private boolean useDataType;
     private boolean useBreadcrumb;
     private boolean beanPostProcessorEnabled = true;
@@ -621,20 +620,6 @@ public abstract class DefaultConfigurationProperties<T> {
         this.endpointBridgeErrorHandler = endpointBridgeErrorHandler;
     }
 
-    public boolean isEndpointBasicPropertyBinding() {
-        return endpointBasicPropertyBinding;
-    }
-
-    /**
-     * Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional
-     * capabilities.
-     *
-     * The default value is false.
-     */
-    public void setEndpointBasicPropertyBinding(boolean endpointBasicPropertyBinding) {
-        this.endpointBasicPropertyBinding = endpointBasicPropertyBinding;
-    }
-
     public boolean isUseDataType() {
         return useDataType;
     }
@@ -1492,17 +1477,6 @@ public abstract class DefaultConfigurationProperties<T> {
     }
 
     /**
-     * Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional
-     * capabilities.
-     *
-     * The default value is false.
-     */
-    public T withEndpointBasicPropertyBinding(boolean endpointBasicPropertyBinding) {
-        this.endpointBasicPropertyBinding = endpointBasicPropertyBinding;
-        return (T) this;
-    }
-
-    /**
      * Whether to enable using data type on Camel messages.
      *
      * Data type are automatic turned on if one ore more routes has been explicit configured with input and output


[camel] 03/07: CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms (consumer)

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 6bec00f604fade012775a692f45bc784dc6abef8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jan 4 18:55:59 2021 +0100

    CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms (consumer)
---
 .../apache/camel/catalog/docs/sjms-component.adoc  |  20 +-
 components/camel-sjms/pom.xml                      |   3 +-
 .../component/sjms/SjmsComponentConfigurer.java    |  18 +-
 .../component/sjms/SjmsEndpointConfigurer.java     |  66 +-
 .../component/sjms/SjmsEndpointUriFactory.java     |  49 +-
 .../org/apache/camel/component/sjms/sjms.json      |  16 +-
 .../camel-sjms/src/main/docs/sjms-component.adoc   |  20 +-
 .../component/sjms/MessageListenerContainer.java   |  30 +
 .../{SjmsConsumer.java => OldSjmsConsumer.java}    |  35 +-
 .../component/sjms/SessionMessageListener.java     |  27 +
 .../apache/camel/component/sjms/SjmsComponent.java |  34 +-
 .../apache/camel/component/sjms/SjmsConsumer.java  | 402 ++--------
 .../apache/camel/component/sjms/SjmsEndpoint.java  | 242 ++++--
 .../apache/camel/component/sjms/SjmsHelper.java    |  90 +++
 .../apache/camel/component/sjms/SjmsProducer.java  |  11 -
 .../apache/camel/component/sjms/SjmsTemplate.java  |   4 +
 .../sjms/consumer/AbstractMessageHandler.java      |   1 +
 .../sjms/consumer/EndpointMessageListener.java     | 430 +++++++++++
 .../sjms/consumer/InOnlyMessageHandler.java        |   1 +
 .../sjms/consumer/InOutMessageHandler.java         |   4 +-
 .../consumer/SimpleMessageListenerContainer.java   | 302 ++++++++
 .../component/sjms/jms/Jms11ObjectFactory.java     |  12 +
 .../camel/component/sjms/jms/JmsBinding.java       |  12 +-
 .../camel/component/sjms/jms/JmsMessageHelper.java |  16 +
 .../camel/component/sjms/jms/JmsObjectFactory.java |   2 +
 .../component/sjms/producer/InOnlyProducer.java    |   3 +-
 .../component/sjms/producer/InOutProducer.java     |   6 +-
 .../sjms/SjmsEndpointConnectionSettingsTest.java   |  13 -
 .../sjms/consumer/AsyncConsumerInOutTest.java      |   6 +-
 .../sjms/consumer/InOnlyConsumerAsyncTrueTest.java |   2 +-
 .../InOnlyConsumerQueueSynchronousTest.java        |   2 +-
 .../sjms/consumer/InOutConsumerQueueAsyncTest.java |   6 +-
 .../consumer/InOutConsumerTempQueueAsyncTest.java  |  10 +-
 .../camel/component/sjms/it/AsyncJmsInOutIT.java   |   4 +-
 .../component/sjms/it/AsyncJmsInOutTempDestIT.java |   4 +-
 .../sjms/producer/AsyncQueueProducerTest.java      |   4 +-
 .../sjms/producer/AsyncTopicProducerTest.java      |   2 +-
 .../producer/InOutQueueProducerAsyncLoadTest.java  |   2 +-
 .../producer/InOutQueueProducerSyncLoadTest.java   |   4 +-
 .../sjms/producer/NoConnectionFactoryTest.java     | 137 ----
 .../component/dsl/SjmsComponentBuilderFactory.java |  50 +-
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   | 835 ++++++++++++++++++---
 .../modules/ROOT/pages/sjms-component.adoc         |  20 +-
 43 files changed, 2143 insertions(+), 814 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc
index 20de46e..cdabfaa 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc
@@ -90,7 +90,7 @@ You append query options to the URI using the following format,
 == Component Options and Configurations
 
 // component options: START
-The Simple JMS component supports 18 options, which are listed below.
+The Simple JMS component supports 17 options, which are listed below.
 
 
 
@@ -100,8 +100,6 @@ The Simple JMS component supports 18 options, which are listed below.
 | *connectionCount* (common) | The maximum number of connections available to endpoints started under this component | 1 | Integer
 | *connectionFactory* (common) | *Autowired* A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource. |  | ConnectionFactory
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
-| *reconnectBackOff* (consumer) | Backoff in millis on consumer pool reconnection attempts | 5000 | long
-| *reconnectOnError* (consumer) | Try to apply reconnection logic on consumer pool | true | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
 | *connectionClientId* (advanced) | The client ID to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
@@ -111,6 +109,7 @@ The Simple JMS component supports 18 options, which are listed below.
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *jmsKeyFormatStrategy* (advanced) | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The default strategy will safely marshal dots and hyphens (. and -). 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  [...]
 | *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
+| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *connectionPassword* (security) | The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
 | *connectionUsername* (security) | The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
@@ -139,7 +138,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (40 parameters):
+=== Query Parameters (47 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -148,16 +147,19 @@ with the following path and query parameters:
 | *acknowledgementMode* (common) | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. There are 4 enums and the value can be one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | SessionAcknowledgementType
 | *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message broker [...]
 | *replyTo* (common) | Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer). |  | String
+| *testConnectionOnStartup* (common) | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | boolean
+| *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100% strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transac [...]
+| *autoStartup* (consumer) | Specifies whether the consumer container should auto-startup. | true | boolean
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *consumerCount* (consumer) | Sets the number of consumer listeners used for this endpoint. | 1 | int
 | *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
-| *reconnectBackOff* (consumer) | Backoff in millis on consumer pool reconnection attempts | 5000 | long
-| *reconnectOnError* (consumer) | Try to apply reconnection logic on consumer pool | true | boolean
 | *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
-| *synchronous* (consumer) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | true | boolean
+| *eagerLoadingOfProperties* (consumer) | Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes can catch early any issues with the underlying JMS provider and the use of JMS properties. See also the option eagerPoisonBody. | false | boolean
+| *eagerPoisonBody* (consumer) | If eagerLoadingOfProperties is enabled and the JMS message payload (JMS body or JMS properties) is poison (cannot be read/mapped), then set this text as the message body instead so the message can be processed (the cause of the poison are already stored as exception on the Exchange). This can be turned off by setting eagerPoisonBody=false. See also the option eagerLoadingOfProperties. | Poison JMS message due to ${exception.message} | String
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
 | *messageSelector* (consumer) | Sets the JMS Message selector syntax. |  | String
+| *replyToSameDestinationAllowed* (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
 | *deliveryMode* (producer) | Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2. There are 2 enums and the value can be one of: 1, 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
@@ -168,6 +170,7 @@ with the following path and query parameters:
 | *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
 | *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
+| *disableTimeToLive* (producer) | Use this option to force disabling time to live. For example when you do request/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message being sent. The problem is that the sender and receiver systems have to have their clocks synchronized, so they are in sync. This is not always so easy to archive. So you can use disableTimeToLive=true to not set a time to live value on the sent message. Then the message w [...]
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
 | *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
@@ -180,6 +183,9 @@ with the following path and query parameters:
 | *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 [...]
 | *mapJmsMessage* (advanced) | Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc. See section about how mapping works below for more details. | true | boolean
 | *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
+| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
+| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index 5066115..d121fcf 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -35,7 +35,6 @@
         <camel.osgi.private.pkg>
             org.apache.camel.component.sjms.consumer,
             org.apache.camel.component.sjms.producer,
-            org.apache.camel.component.sjms.taskmanager,
             org.apache.camel.component.sjms.tx
         </camel.osgi.private.pkg>
         <camel.osgi.import>
@@ -49,6 +48,8 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-support</artifactId>
         </dependency>
+
+        <!-- TODO: remove our own pooling -->
         <dependency>
             <groupId>commons-pool</groupId>
             <artifactId>commons-pool</artifactId>
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java
index 7845805..505241f 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java
@@ -51,10 +51,8 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
         case "messagecreatedstrategy":
         case "messageCreatedStrategy": target.setMessageCreatedStrategy(property(camelContext, org.apache.camel.component.sjms.jms.MessageCreatedStrategy.class, value)); return true;
-        case "reconnectbackoff":
-        case "reconnectBackOff": target.setReconnectBackOff(property(camelContext, long.class, value)); return true;
-        case "reconnectonerror":
-        case "reconnectOnError": target.setReconnectOnError(property(camelContext, boolean.class, value)); return true;
+        case "recoveryinterval":
+        case "recoveryInterval": target.setRecoveryInterval(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
         case "transactioncommitstrategy":
         case "transactionCommitStrategy": target.setTransactionCommitStrategy(property(camelContext, org.apache.camel.component.sjms.TransactionCommitStrategy.class, value)); return true;
         default: return false;
@@ -99,10 +97,8 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "lazyStartProducer": return boolean.class;
         case "messagecreatedstrategy":
         case "messageCreatedStrategy": return org.apache.camel.component.sjms.jms.MessageCreatedStrategy.class;
-        case "reconnectbackoff":
-        case "reconnectBackOff": return long.class;
-        case "reconnectonerror":
-        case "reconnectOnError": return boolean.class;
+        case "recoveryinterval":
+        case "recoveryInterval": return long.class;
         case "transactioncommitstrategy":
         case "transactionCommitStrategy": return org.apache.camel.component.sjms.TransactionCommitStrategy.class;
         default: return null;
@@ -143,10 +139,8 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "lazyStartProducer": return target.isLazyStartProducer();
         case "messagecreatedstrategy":
         case "messageCreatedStrategy": return target.getMessageCreatedStrategy();
-        case "reconnectbackoff":
-        case "reconnectBackOff": return target.getReconnectBackOff();
-        case "reconnectonerror":
-        case "reconnectOnError": return target.isReconnectOnError();
+        case "recoveryinterval":
+        case "recoveryInterval": return target.getRecoveryInterval();
         case "transactioncommitstrategy":
         case "transactionCommitStrategy": return target.getTransactionCommitStrategy();
         default: return null;
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java
index 31c7005..7fd6f8c 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java
@@ -25,10 +25,14 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "acknowledgementMode": target.setAcknowledgementMode(property(camelContext, org.apache.camel.component.sjms.jms.SessionAcknowledgementType.class, value)); return true;
         case "allownullbody":
         case "allowNullBody": target.setAllowNullBody(property(camelContext, boolean.class, value)); return true;
+        case "asyncconsumer":
+        case "asyncConsumer": target.setAsyncConsumer(property(camelContext, boolean.class, value)); return true;
         case "asyncstartlistener":
         case "asyncStartListener": target.setAsyncStartListener(property(camelContext, boolean.class, value)); return true;
         case "asyncstoplistener":
         case "asyncStopListener": target.setAsyncStopListener(property(camelContext, boolean.class, value)); return true;
+        case "autostartup":
+        case "autoStartup": target.setAutoStartup(property(camelContext, boolean.class, value)); return true;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
         case "connectioncount":
@@ -47,8 +51,14 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "destinationCreationStrategy": target.setDestinationCreationStrategy(property(camelContext, org.apache.camel.component.sjms.jms.DestinationCreationStrategy.class, value)); return true;
         case "disablereplyto":
         case "disableReplyTo": target.setDisableReplyTo(property(camelContext, boolean.class, value)); return true;
+        case "disabletimetolive":
+        case "disableTimeToLive": target.setDisableTimeToLive(property(camelContext, boolean.class, value)); return true;
         case "durablesubscriptionid":
         case "durableSubscriptionId": target.setDurableSubscriptionId(property(camelContext, java.lang.String.class, value)); return true;
+        case "eagerloadingofproperties":
+        case "eagerLoadingOfProperties": target.setEagerLoadingOfProperties(property(camelContext, boolean.class, value)); return true;
+        case "eagerpoisonbody":
+        case "eagerPoisonBody": target.setEagerPoisonBody(property(camelContext, java.lang.String.class, value)); return true;
         case "errorhandlerlogstacktrace":
         case "errorHandlerLogStackTrace": target.setErrorHandlerLogStackTrace(property(camelContext, boolean.class, value)); return true;
         case "errorhandlerlogginglevel":
@@ -78,26 +88,30 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "preservemessageqos":
         case "preserveMessageQos": target.setPreserveMessageQos(property(camelContext, boolean.class, value)); return true;
         case "priority": target.setPriority(property(camelContext, int.class, value)); return true;
-        case "reconnectbackoff":
-        case "reconnectBackOff": target.setReconnectBackOff(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
-        case "reconnectonerror":
-        case "reconnectOnError": target.setReconnectOnError(property(camelContext, boolean.class, value)); return true;
+        case "recoveryinterval":
+        case "recoveryInterval": target.setRecoveryInterval(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
         case "replyto":
         case "replyTo": target.setReplyTo(property(camelContext, java.lang.String.class, value)); return true;
         case "replytodeliverypersistent":
         case "replyToDeliveryPersistent": target.setReplyToDeliveryPersistent(property(camelContext, boolean.class, value)); return true;
         case "replytooverride":
         case "replyToOverride": target.setReplyToOverride(property(camelContext, java.lang.String.class, value)); return true;
+        case "replytosamedestinationallowed":
+        case "replyToSameDestinationAllowed": target.setReplyToSameDestinationAllowed(property(camelContext, boolean.class, value)); return true;
         case "requesttimeout":
         case "requestTimeout": target.setRequestTimeout(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
         case "sharedjmssession":
         case "sharedJMSSession": target.setSharedJMSSession(property(camelContext, boolean.class, value)); return true;
         case "synchronous": target.setSynchronous(property(camelContext, boolean.class, value)); return true;
+        case "testconnectiononstartup":
+        case "testConnectionOnStartup": target.setTestConnectionOnStartup(property(camelContext, boolean.class, value)); return true;
         case "timetolive":
         case "timeToLive": target.setTimeToLive(property(camelContext, long.class, value)); return true;
         case "transacted": target.setTransacted(property(camelContext, boolean.class, value)); return true;
         case "transactioncommitstrategy":
         case "transactionCommitStrategy": target.setTransactionCommitStrategy(property(camelContext, org.apache.camel.component.sjms.TransactionCommitStrategy.class, value)); return true;
+        case "transferexception":
+        case "transferException": target.setTransferException(property(camelContext, boolean.class, value)); return true;
         default: return false;
         }
     }
@@ -109,10 +123,14 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "acknowledgementMode": return org.apache.camel.component.sjms.jms.SessionAcknowledgementType.class;
         case "allownullbody":
         case "allowNullBody": return boolean.class;
+        case "asyncconsumer":
+        case "asyncConsumer": return boolean.class;
         case "asyncstartlistener":
         case "asyncStartListener": return boolean.class;
         case "asyncstoplistener":
         case "asyncStopListener": return boolean.class;
+        case "autostartup":
+        case "autoStartup": return boolean.class;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return boolean.class;
         case "connectioncount":
@@ -131,8 +149,14 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "destinationCreationStrategy": return org.apache.camel.component.sjms.jms.DestinationCreationStrategy.class;
         case "disablereplyto":
         case "disableReplyTo": return boolean.class;
+        case "disabletimetolive":
+        case "disableTimeToLive": return boolean.class;
         case "durablesubscriptionid":
         case "durableSubscriptionId": return java.lang.String.class;
+        case "eagerloadingofproperties":
+        case "eagerLoadingOfProperties": return boolean.class;
+        case "eagerpoisonbody":
+        case "eagerPoisonBody": return java.lang.String.class;
         case "errorhandlerlogstacktrace":
         case "errorHandlerLogStackTrace": return boolean.class;
         case "errorhandlerlogginglevel":
@@ -162,26 +186,30 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "preservemessageqos":
         case "preserveMessageQos": return boolean.class;
         case "priority": return int.class;
-        case "reconnectbackoff":
-        case "reconnectBackOff": return long.class;
-        case "reconnectonerror":
-        case "reconnectOnError": return boolean.class;
+        case "recoveryinterval":
+        case "recoveryInterval": return long.class;
         case "replyto":
         case "replyTo": return java.lang.String.class;
         case "replytodeliverypersistent":
         case "replyToDeliveryPersistent": return boolean.class;
         case "replytooverride":
         case "replyToOverride": return java.lang.String.class;
+        case "replytosamedestinationallowed":
+        case "replyToSameDestinationAllowed": return boolean.class;
         case "requesttimeout":
         case "requestTimeout": return long.class;
         case "sharedjmssession":
         case "sharedJMSSession": return boolean.class;
         case "synchronous": return boolean.class;
+        case "testconnectiononstartup":
+        case "testConnectionOnStartup": return boolean.class;
         case "timetolive":
         case "timeToLive": return long.class;
         case "transacted": return boolean.class;
         case "transactioncommitstrategy":
         case "transactionCommitStrategy": return org.apache.camel.component.sjms.TransactionCommitStrategy.class;
+        case "transferexception":
+        case "transferException": return boolean.class;
         default: return null;
         }
     }
@@ -194,10 +222,14 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "acknowledgementMode": return target.getAcknowledgementMode();
         case "allownullbody":
         case "allowNullBody": return target.isAllowNullBody();
+        case "asyncconsumer":
+        case "asyncConsumer": return target.isAsyncConsumer();
         case "asyncstartlistener":
         case "asyncStartListener": return target.isAsyncStartListener();
         case "asyncstoplistener":
         case "asyncStopListener": return target.isAsyncStopListener();
+        case "autostartup":
+        case "autoStartup": return target.isAutoStartup();
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return target.isBridgeErrorHandler();
         case "connectioncount":
@@ -216,8 +248,14 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "destinationCreationStrategy": return target.getDestinationCreationStrategy();
         case "disablereplyto":
         case "disableReplyTo": return target.isDisableReplyTo();
+        case "disabletimetolive":
+        case "disableTimeToLive": return target.isDisableTimeToLive();
         case "durablesubscriptionid":
         case "durableSubscriptionId": return target.getDurableSubscriptionId();
+        case "eagerloadingofproperties":
+        case "eagerLoadingOfProperties": return target.isEagerLoadingOfProperties();
+        case "eagerpoisonbody":
+        case "eagerPoisonBody": return target.getEagerPoisonBody();
         case "errorhandlerlogstacktrace":
         case "errorHandlerLogStackTrace": return target.isErrorHandlerLogStackTrace();
         case "errorhandlerlogginglevel":
@@ -247,26 +285,30 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "preservemessageqos":
         case "preserveMessageQos": return target.isPreserveMessageQos();
         case "priority": return target.getPriority();
-        case "reconnectbackoff":
-        case "reconnectBackOff": return target.getReconnectBackOff();
-        case "reconnectonerror":
-        case "reconnectOnError": return target.isReconnectOnError();
+        case "recoveryinterval":
+        case "recoveryInterval": return target.getRecoveryInterval();
         case "replyto":
         case "replyTo": return target.getReplyTo();
         case "replytodeliverypersistent":
         case "replyToDeliveryPersistent": return target.isReplyToDeliveryPersistent();
         case "replytooverride":
         case "replyToOverride": return target.getReplyToOverride();
+        case "replytosamedestinationallowed":
+        case "replyToSameDestinationAllowed": return target.isReplyToSameDestinationAllowed();
         case "requesttimeout":
         case "requestTimeout": return target.getRequestTimeout();
         case "sharedjmssession":
         case "sharedJMSSession": return target.isSharedJMSSession();
         case "synchronous": return target.isSynchronous();
+        case "testconnectiononstartup":
+        case "testConnectionOnStartup": return target.isTestConnectionOnStartup();
         case "timetolive":
         case "timeToLive": return target.getTimeToLive();
         case "transacted": return target.isTransacted();
         case "transactioncommitstrategy":
         case "transactionCommitStrategy": return target.getTransactionCommitStrategy();
+        case "transferexception":
+        case "transferException": return target.isTransferException();
         default: return null;
         }
     }
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java
index 48bbd31..d84eb11 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java
@@ -20,49 +20,56 @@ public class SjmsEndpointUriFactory extends org.apache.camel.support.component.E
     private static final Set<String> PROPERTY_NAMES;
     private static final Set<String> SECRET_PROPERTY_NAMES;
     static {
-        Set<String> props = new HashSet<>(42);
-        props.add("reconnectBackOff");
-        props.add("connectionCount");
+        Set<String> props = new HashSet<>(49);
+        props.add("asyncConsumer");
         props.add("mapJmsMessage");
         props.add("synchronous");
-        props.add("connectionResource");
         props.add("includeAllJMSXProperties");
-        props.add("explicitQosEnabled");
-        props.add("transacted");
         props.add("errorHandlerLogStackTrace");
+        props.add("eagerLoadingOfProperties");
         props.add("timeToLive");
         props.add("bridgeErrorHandler");
-        props.add("jmsKeyFormatStrategy");
         props.add("deliveryMode");
-        props.add("headerFilterStrategy");
+        props.add("transferException");
         props.add("exceptionListener");
-        props.add("destinationName");
-        props.add("messageCreatedStrategy");
-        props.add("asyncStopListener");
         props.add("destinationType");
         props.add("asyncStartListener");
-        props.add("requestTimeout");
-        props.add("allowNullBody");
-        props.add("replyToDeliveryPersistent");
-        props.add("disableReplyTo");
-        props.add("reconnectOnError");
-        props.add("consumerCount");
+        props.add("eagerPoisonBody");
         props.add("destinationCreationStrategy");
-        props.add("exchangePattern");
+        props.add("disableTimeToLive");
         props.add("messageSelector");
         props.add("deliveryPersistent");
-        props.add("preserveMessageQos");
         props.add("priority");
         props.add("acknowledgementMode");
         props.add("lazyStartProducer");
         props.add("transactionCommitStrategy");
-        props.add("connectionFactory");
         props.add("replyTo");
         props.add("replyToOverride");
         props.add("errorHandlerLoggingLevel");
-        props.add("sharedJMSSession");
         props.add("durableSubscriptionId");
         props.add("exceptionHandler");
+        props.add("connectionCount");
+        props.add("connectionResource");
+        props.add("explicitQosEnabled");
+        props.add("transacted");
+        props.add("autoStartup");
+        props.add("jmsKeyFormatStrategy");
+        props.add("headerFilterStrategy");
+        props.add("destinationName");
+        props.add("messageCreatedStrategy");
+        props.add("asyncStopListener");
+        props.add("requestTimeout");
+        props.add("allowNullBody");
+        props.add("replyToDeliveryPersistent");
+        props.add("disableReplyTo");
+        props.add("consumerCount");
+        props.add("recoveryInterval");
+        props.add("exchangePattern");
+        props.add("preserveMessageQos");
+        props.add("testConnectionOnStartup");
+        props.add("connectionFactory");
+        props.add("replyToSameDestinationAllowed");
+        props.add("sharedJMSSession");
         PROPERTY_NAMES = Collections.unmodifiableSet(props);
         SECRET_PROPERTY_NAMES = Collections.emptySet();
     }
diff --git a/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json b/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json
index 47a2980..040eaa9 100644
--- a/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json
+++ b/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json
@@ -25,8 +25,6 @@
     "connectionCount": { "kind": "property", "displayName": "Connection Count", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "description": "The maximum number of connections available to endpoints started under this component" },
     "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": true, "secret": false, "description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource." },
     "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
-    "reconnectBackOff": { "kind": "property", "displayName": "Reconnect Back Off", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 5000, "description": "Backoff in millis on consumer pool reconnection attempts" },
-    "reconnectOnError": { "kind": "property", "displayName": "Reconnect On Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Try to apply reconnection logic on consumer pool" },
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
     "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
     "connectionClientId": { "kind": "property", "displayName": "Connection Client Id", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The client ID to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
@@ -36,6 +34,7 @@
     "destinationCreationStrategy": { "kind": "property", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
     "jmsKeyFormatStrategy": { "kind": "property", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The defau [...]
     "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
+    "recoveryInterval": { "kind": "property", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
     "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "connectionPassword": { "kind": "property", "displayName": "Connection Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
     "connectionUsername": { "kind": "property", "displayName": "Connection Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
@@ -47,16 +46,19 @@
     "acknowledgementMode": { "kind": "parameter", "displayName": "Acknowledgement Mode", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.SessionAcknowledgementType", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "description": "The JMS acknowledgement name, which is one of:  [...]
     "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from  [...]
     "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
+    "testConnectionOnStartup": { "kind": "parameter", "displayName": "Test Connection On Startup", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel [...]
+    "asyncConsumer": { "kind": "parameter", "displayName": "Async Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asy [...]
+    "autoStartup": { "kind": "parameter", "displayName": "Auto Startup", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether the consumer container should auto-startup." },
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
     "consumerCount": { "kind": "parameter", "displayName": "Consumer Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Sets the number of consumer listeners used for this endpoint." },
     "durableSubscriptionId": { "kind": "parameter", "displayName": "Durable Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the durable subscription Id required for durable topics." },
-    "reconnectBackOff": { "kind": "parameter", "displayName": "Reconnect Back Off", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Backoff in millis on consumer pool reconnection attempts" },
-    "reconnectOnError": { "kind": "parameter", "displayName": "Reconnect On Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Try to apply reconnection logic on consumer pool" },
     "replyToDeliveryPersistent": { "kind": "parameter", "displayName": "Reply To Delivery Persistent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to use persistent delivery by default for replies." },
-    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported)." },
+    "eagerLoadingOfProperties": { "kind": "parameter", "displayName": "Eager Loading Of Properties", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes c [...]
+    "eagerPoisonBody": { "kind": "parameter", "displayName": "Eager Poison Body", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Poison JMS message due to ${exception.message}", "description": "If eagerLoadingOfProperties is enabled and the JMS message payload (JMS body or JMS properties) is poison (cannot be read\/mapped), then se [...]
     "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
     "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
     "messageSelector": { "kind": "parameter", "displayName": "Message Selector", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the JMS Message selector syntax." },
+    "replyToSameDestinationAllowed": { "kind": "parameter", "displayName": "Reply To Same Destination Allowed", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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 c [...]
     "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2." },
     "deliveryPersistent": { "kind": "parameter", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether persistent delivery is used by default." },
     "explicitQosEnabled": { "kind": "parameter", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "description": "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 timeToLi [...]
@@ -67,6 +69,7 @@
     "requestTimeout": { "kind": "parameter", "displayName": "Request Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "20000", "description": "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 timeou [...]
     "timeToLive": { "kind": "parameter", "displayName": "Time To Live", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "description": "When sending messages, specifies the time-to-live of the message (in milliseconds)." },
     "allowNullBody": { "kind": "parameter", "displayName": "Allow Null Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an JMSException is thrown." },
+    "disableTimeToLive": { "kind": "parameter", "displayName": "Disable Time To Live", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Use this option to force disabling time to live. For example when you do request\/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message  [...]
     "asyncStartListener": { "kind": "parameter", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/o [...]
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to stop the consumer message listener asynchronously, when stopping a route." },
     "connectionCount": { "kind": "parameter", "displayName": "Connection Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "description": "The maximum number of connections available to this endpoint" },
@@ -79,6 +82,9 @@
     "jmsKeyFormatStrategy": { "kind": "parameter", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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 pass [...]
     "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc. See section about how mapping works below for more details." },
     "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
+    "recoveryInterval": { "kind": "parameter", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
+    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
+    "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client i [...]
     "errorHandlerLoggingLevel": { "kind": "parameter", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "description": "Allows to configure the default errorHandler logging level for logging uncaught exceptions." },
     "errorHandlerLogStackTrace": { "kind": "parameter", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Allows to control whether stacktraces should be logged or not, by the default errorHandler." },
     "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to use transacted mode" },
diff --git a/components/camel-sjms/src/main/docs/sjms-component.adoc b/components/camel-sjms/src/main/docs/sjms-component.adoc
index 20de46e..cdabfaa 100644
--- a/components/camel-sjms/src/main/docs/sjms-component.adoc
+++ b/components/camel-sjms/src/main/docs/sjms-component.adoc
@@ -90,7 +90,7 @@ You append query options to the URI using the following format,
 == Component Options and Configurations
 
 // component options: START
-The Simple JMS component supports 18 options, which are listed below.
+The Simple JMS component supports 17 options, which are listed below.
 
 
 
@@ -100,8 +100,6 @@ The Simple JMS component supports 18 options, which are listed below.
 | *connectionCount* (common) | The maximum number of connections available to endpoints started under this component | 1 | Integer
 | *connectionFactory* (common) | *Autowired* A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource. |  | ConnectionFactory
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
-| *reconnectBackOff* (consumer) | Backoff in millis on consumer pool reconnection attempts | 5000 | long
-| *reconnectOnError* (consumer) | Try to apply reconnection logic on consumer pool | true | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
 | *connectionClientId* (advanced) | The client ID to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
@@ -111,6 +109,7 @@ The Simple JMS component supports 18 options, which are listed below.
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *jmsKeyFormatStrategy* (advanced) | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The default strategy will safely marshal dots and hyphens (. and -). 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  [...]
 | *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
+| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *connectionPassword* (security) | The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
 | *connectionUsername* (security) | The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
@@ -139,7 +138,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (40 parameters):
+=== Query Parameters (47 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -148,16 +147,19 @@ with the following path and query parameters:
 | *acknowledgementMode* (common) | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. There are 4 enums and the value can be one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | SessionAcknowledgementType
 | *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message broker [...]
 | *replyTo* (common) | Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer). |  | String
+| *testConnectionOnStartup* (common) | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | boolean
+| *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100% strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transac [...]
+| *autoStartup* (consumer) | Specifies whether the consumer container should auto-startup. | true | boolean
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *consumerCount* (consumer) | Sets the number of consumer listeners used for this endpoint. | 1 | int
 | *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
-| *reconnectBackOff* (consumer) | Backoff in millis on consumer pool reconnection attempts | 5000 | long
-| *reconnectOnError* (consumer) | Try to apply reconnection logic on consumer pool | true | boolean
 | *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
-| *synchronous* (consumer) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | true | boolean
+| *eagerLoadingOfProperties* (consumer) | Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes can catch early any issues with the underlying JMS provider and the use of JMS properties. See also the option eagerPoisonBody. | false | boolean
+| *eagerPoisonBody* (consumer) | If eagerLoadingOfProperties is enabled and the JMS message payload (JMS body or JMS properties) is poison (cannot be read/mapped), then set this text as the message body instead so the message can be processed (the cause of the poison are already stored as exception on the Exchange). This can be turned off by setting eagerPoisonBody=false. See also the option eagerLoadingOfProperties. | Poison JMS message due to ${exception.message} | String
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
 | *messageSelector* (consumer) | Sets the JMS Message selector syntax. |  | String
+| *replyToSameDestinationAllowed* (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
 | *deliveryMode* (producer) | Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2. There are 2 enums and the value can be one of: 1, 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
@@ -168,6 +170,7 @@ with the following path and query parameters:
 | *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
 | *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
+| *disableTimeToLive* (producer) | Use this option to force disabling time to live. For example when you do request/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message being sent. The problem is that the sender and receiver systems have to have their clocks synchronized, so they are in sync. This is not always so easy to archive. So you can use disableTimeToLive=true to not set a time to live value on the sent message. Then the message w [...]
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
 | *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
@@ -180,6 +183,9 @@ with the following path and query parameters:
 | *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 [...]
 | *mapJmsMessage* (advanced) | Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc. See section about how mapping works below for more details. | true | boolean
 | *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
+| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
+| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageListenerContainer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageListenerContainer.java
new file mode 100644
index 0000000..e85772a
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageListenerContainer.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms;
+
+import javax.jms.ConnectionFactory;
+
+import org.apache.camel.AfterPropertiesConfigured;
+import org.apache.camel.Service;
+
+public interface MessageListenerContainer extends Service, AfterPropertiesConfigured {
+
+    ConnectionFactory getConnectionFactory();
+
+    void setMessageListener(SessionMessageListener messageListener);
+
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/OldSjmsConsumer.java
similarity index 92%
copy from components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java
copy to components/camel-sjms/src/main/java/org/apache/camel/component/sjms/OldSjmsConsumer.java
index f1ffcaf..9138957 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/OldSjmsConsumer.java
@@ -53,16 +53,17 @@ import org.slf4j.LoggerFactory;
 /**
  * The SjmsConsumer is the base class for the SJMS MessageListener pool.
  */
-public class SjmsConsumer extends DefaultConsumer {
+@Deprecated
+public class OldSjmsConsumer extends DefaultConsumer {
 
-    private static final Logger LOG = LoggerFactory.getLogger(SjmsConsumer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(OldSjmsConsumer.class);
 
     private final Map<Connection, List<MessageConsumerResources>> consumers = new WeakHashMap<>();
     private ScheduledExecutorService scheduler;
     private Future<?> asyncStart;
     private BackOffTimer.Task rescheduleTask;
 
-    public SjmsConsumer(Endpoint endpoint, Processor processor) {
+    public OldSjmsConsumer(Endpoint endpoint, Processor processor) {
         super(endpoint, processor);
     }
 
@@ -87,9 +88,7 @@ public class SjmsConsumer extends DefaultConsumer {
                         LOG.warn("Error starting listener container on destination: " + getDestinationName()
                                  + ". This exception will be ignored.",
                                 e);
-                        if (getEndpoint().isReconnectOnError()) {
-                            scheduleRefill(); //we should try to fill consumer pool on next time
-                        }
+                        scheduleRefill(); //we should try to fill consumer pool on next time
                     }
                 }
 
@@ -148,7 +147,7 @@ public class SjmsConsumer extends DefaultConsumer {
                 public void run() {
                     try {
                         synchronized (consumers) {
-                            consumers.values().stream().flatMap(Collection::stream).forEach(SjmsConsumer.this::destroyObject);
+                            consumers.values().stream().flatMap(Collection::stream).forEach(OldSjmsConsumer.this::destroyObject);
                             consumers.clear();
                         }
                     } catch (Throwable e) {
@@ -165,7 +164,7 @@ public class SjmsConsumer extends DefaultConsumer {
             });
         } else {
             synchronized (consumers) {
-                consumers.values().stream().flatMap(Collection::stream).forEach(SjmsConsumer.this::destroyObject);
+                consumers.values().stream().flatMap(Collection::stream).forEach(OldSjmsConsumer.this::destroyObject);
                 consumers.clear();
             }
         }
@@ -189,16 +188,14 @@ public class SjmsConsumer extends DefaultConsumer {
             MessageListener handler = createMessageHandler(session);
             messageConsumer.setMessageListener(handler);
 
-            if (getEndpoint().isReconnectOnError()) {
-                ExceptionListener exceptionListener = conn.getExceptionListener();
-                ReconnectExceptionListener reconnectExceptionListener = new ReconnectExceptionListener(conn);
-                if (exceptionListener == null) {
-                    exceptionListener = reconnectExceptionListener;
-                } else {
-                    exceptionListener = new AggregatedExceptionListener(exceptionListener, reconnectExceptionListener);
-                }
-                conn.setExceptionListener(exceptionListener);
+            ExceptionListener exceptionListener = conn.getExceptionListener();
+            ReconnectExceptionListener reconnectExceptionListener = new ReconnectExceptionListener(conn);
+            if (exceptionListener == null) {
+                exceptionListener = reconnectExceptionListener;
+            } else {
+                exceptionListener = new AggregatedExceptionListener(exceptionListener, reconnectExceptionListener);
             }
+            conn.setExceptionListener(exceptionListener);
             answer = new MessageConsumerResources(session, messageConsumer);
             consumers.compute(conn, (key, oldValue) -> {
                 if (oldValue == null) {
@@ -373,7 +370,7 @@ public class SjmsConsumer extends DefaultConsumer {
 
     private void scheduleRefill() {
         if (rescheduleTask == null || rescheduleTask.getStatus() != BackOffTimer.Task.Status.Active) {
-            BackOff backOff = BackOff.builder().delay(getEndpoint().getReconnectBackOff()).build();
+            BackOff backOff = BackOff.builder().delay(getEndpoint().getRecoveryInterval()).build();
             rescheduleTask = new BackOffTimer(scheduler).schedule(backOff, this::refillPool);
         }
     }
@@ -393,7 +390,7 @@ public class SjmsConsumer extends DefaultConsumer {
                 synchronized (consumers) {
                     List<MessageConsumerResources> toClose = consumers.get(currentConnection);
                     if (toClose != null) {
-                        toClose.forEach(SjmsConsumer.this::destroyObject);
+                        toClose.forEach(OldSjmsConsumer.this::destroyObject);
                     }
                     consumers.remove(currentConnection);
                 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SessionMessageListener.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SessionMessageListener.java
new file mode 100644
index 0000000..85d9376
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SessionMessageListener.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms;
+
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
+
+@FunctionalInterface
+public interface SessionMessageListener {
+
+    void onMessage(Message message, Session session) throws JMSException;
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
index 1b4fe9a..a8865f4 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
@@ -85,11 +85,10 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
               description = "The max wait time in millis to block and wait on free connection when the pool"
                             + " is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource.")
     private long connectionMaxWait = 5000;
-    @Metadata(label = "consumer", description = "Try to apply reconnection logic on consumer pool", defaultValue = "true")
-    private boolean reconnectOnError = true;
-    @Metadata(label = "consumer", description = "Backoff in millis on consumer pool reconnection attempts",
-              defaultValue = "5000")
-    private long reconnectBackOff = 5000;
+    @Metadata(defaultValue = "5000", label = "advanced", javaType = "java.time.Duration",
+              description = "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds."
+                            + " The default is 5000 ms, that is, 5 seconds.")
+    private long recoveryInterval = 5000;
 
     public SjmsComponent() {
     }
@@ -116,8 +115,7 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
         if (messageCreatedStrategy != null) {
             endpoint.setMessageCreatedStrategy(messageCreatedStrategy);
         }
-        endpoint.setReconnectOnError(reconnectOnError);
-        endpoint.setReconnectBackOff(reconnectBackOff);
+        endpoint.setRecoveryInterval(recoveryInterval);
         setProperties(endpoint, parameters);
         return endpoint;
     }
@@ -311,25 +309,11 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
         this.connectionMaxWait = connectionMaxWait;
     }
 
-    public boolean isReconnectOnError() {
-        return reconnectOnError;
+    public long getRecoveryInterval() {
+        return recoveryInterval;
     }
 
-    /**
-     * Try to apply reconnection logic on consumer pool
-     */
-    public void setReconnectOnError(boolean reconnectOnError) {
-        this.reconnectOnError = reconnectOnError;
-    }
-
-    public long getReconnectBackOff() {
-        return reconnectBackOff;
-    }
-
-    /**
-     * Backoff in millis on consumer pool reconnection attempts
-     */
-    public void setReconnectBackOff(long reconnectBackOff) {
-        this.reconnectBackOff = reconnectBackOff;
+    public void setRecoveryInterval(long recoveryInterval) {
+        this.recoveryInterval = recoveryInterval;
     }
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java
index f1ffcaf..e805bb2 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java
@@ -16,54 +16,29 @@
  */
 package org.apache.camel.component.sjms;
 
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.WeakHashMap;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.stream.Collectors;
-
 import javax.jms.Connection;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.Session;
 
 import org.apache.camel.Endpoint;
-import org.apache.camel.ExchangePattern;
+import org.apache.camel.FailedToCreateConsumerException;
 import org.apache.camel.Processor;
-import org.apache.camel.component.sjms.consumer.AbstractMessageHandler;
-import org.apache.camel.component.sjms.consumer.InOnlyMessageHandler;
-import org.apache.camel.component.sjms.consumer.InOutMessageHandler;
-import org.apache.camel.component.sjms.jms.ConnectionResource;
-import org.apache.camel.component.sjms.tx.DefaultTransactionCommitStrategy;
-import org.apache.camel.component.sjms.tx.SessionTransactionSynchronization;
-import org.apache.camel.spi.Synchronization;
+import org.apache.camel.Suspendable;
 import org.apache.camel.support.DefaultConsumer;
-import org.apache.camel.util.backoff.BackOff;
-import org.apache.camel.util.backoff.BackOffTimer;
+import org.apache.camel.support.service.ServiceHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * The SjmsConsumer is the base class for the SJMS MessageListener pool.
- */
-public class SjmsConsumer extends DefaultConsumer {
+import static org.apache.camel.component.sjms.SjmsHelper.closeConnection;
+
+public class SjmsConsumer extends DefaultConsumer implements Suspendable {
 
     private static final Logger LOG = LoggerFactory.getLogger(SjmsConsumer.class);
 
-    private final Map<Connection, List<MessageConsumerResources>> consumers = new WeakHashMap<>();
-    private ScheduledExecutorService scheduler;
-    private Future<?> asyncStart;
-    private BackOffTimer.Task rescheduleTask;
+    private volatile boolean initialized;
+    private final MessageListenerContainer listenerContainer;
 
-    public SjmsConsumer(Endpoint endpoint, Processor processor) {
+    public SjmsConsumer(Endpoint endpoint, Processor processor, MessageListenerContainer listenerContainer) {
         super(endpoint, processor);
+        this.listenerContainer = listenerContainer;
     }
 
     @Override
@@ -75,21 +50,15 @@ public class SjmsConsumer extends DefaultConsumer {
     protected void doStart() throws Exception {
         super.doStart();
 
-        this.scheduler = getEndpoint().getCamelContext().getExecutorServiceManager().newDefaultScheduledThreadPool(this,
-                "SjmsConsumer");
         if (getEndpoint().isAsyncStartListener()) {
-            asyncStart = getEndpoint().getComponent().getAsyncStartStopExecutorService().submit(new Runnable() {
+            getEndpoint().getAsyncStartStopExecutorService().submit(new Runnable() {
                 @Override
                 public void run() {
                     try {
-                        fillConsumersPool();
+                        prepareAndStartListenerContainer();
                     } catch (Throwable e) {
-                        LOG.warn("Error starting listener container on destination: " + getDestinationName()
-                                 + ". This exception will be ignored.",
-                                e);
-                        if (getEndpoint().isReconnectOnError()) {
-                            scheduleRefill(); //we should try to fill consumer pool on next time
-                        }
+                        LOG.warn("Error starting listener container on destination: {}. This exception will be ignored.",
+                                getDestinationName(), e);
                     }
                 }
 
@@ -99,325 +68,94 @@ public class SjmsConsumer extends DefaultConsumer {
                 }
             });
         } else {
-            fillConsumersPool();
+            prepareAndStartListenerContainer();
         }
-    }
 
-    private void fillConsumersPool() throws Exception {
-        synchronized (consumers) {
-            while (consumers.values().stream().collect(Collectors.summarizingInt(List::size)).getSum() < getConsumerCount()) {
-                addConsumer();
-            }
-        }
-    }
-
-    public void destroyObject(MessageConsumerResources model) {
-        try {
-            if (model.getMessageConsumer() != null) {
-                model.getMessageConsumer().close();
-            }
-
-            // If the resource has a
-            if (model.getSession() != null) {
-                if (model.getSession().getTransacted()) {
-                    try {
-                        model.getSession().rollback();
-                    } catch (Exception e) {
-                        // Do nothing. Just make sure we are cleaned up
-                    }
-                }
-                model.getSession().close();
-            }
-        } catch (JMSException ex) {
-            LOG.warn("Exception caught on closing consumer", ex);
-        }
+        // mark as initialized for the first time
+        initialized = true;
     }
 
     @Override
     protected void doStop() throws Exception {
-        super.doStop();
-        if (asyncStart != null && !asyncStart.isDone()) {
-            asyncStart.cancel(true);
-        }
-        if (rescheduleTask != null) {
-            rescheduleTask.cancel();
-        }
-        if (getEndpoint().isAsyncStopListener()) {
-            getEndpoint().getComponent().getAsyncStartStopExecutorService().submit(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        synchronized (consumers) {
-                            consumers.values().stream().flatMap(Collection::stream).forEach(SjmsConsumer.this::destroyObject);
-                            consumers.clear();
+        if (listenerContainer != null) {
+
+            if (getEndpoint().isAsyncStopListener()) {
+                getEndpoint().getAsyncStartStopExecutorService().submit(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            stopAndDestroyListenerContainer();
+                        } catch (Throwable e) {
+                            LOG.warn("Error stopping listener container on destination: {}. This exception will be ignored.",
+                                    getDestinationName(), e);
                         }
-                    } catch (Throwable e) {
-                        LOG.warn("Error stopping listener container on destination: " + getDestinationName()
-                                 + ". This exception will be ignored.",
-                                e);
                     }
-                }
-
-                @Override
-                public String toString() {
-                    return "AsyncStopListenerTask[" + getDestinationName() + "]";
-                }
-            });
-        } else {
-            synchronized (consumers) {
-                consumers.values().stream().flatMap(Collection::stream).forEach(SjmsConsumer.this::destroyObject);
-                consumers.clear();
-            }
-        }
-        if (this.scheduler != null) {
-            getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(this.scheduler);
-        }
-    }
-
-    /**
-     * Creates a {@link MessageConsumerResources} with a dedicated {@link Session} required for transacted and InOut
-     * consumers.
-     */
-    private void addConsumer() throws Exception {
-        MessageConsumerResources answer;
-        ConnectionResource connectionResource = getOrCreateConnectionResource();
-        Connection conn = connectionResource.borrowConnection();
-        try {
-            Session session = conn.createSession(isTransacted(),
-                    isTransacted() ? Session.SESSION_TRANSACTED : Session.AUTO_ACKNOWLEDGE);
-            MessageConsumer messageConsumer = getEndpoint().getJmsObjectFactory().createMessageConsumer(session, getEndpoint());
-            MessageListener handler = createMessageHandler(session);
-            messageConsumer.setMessageListener(handler);
-
-            if (getEndpoint().isReconnectOnError()) {
-                ExceptionListener exceptionListener = conn.getExceptionListener();
-                ReconnectExceptionListener reconnectExceptionListener = new ReconnectExceptionListener(conn);
-                if (exceptionListener == null) {
-                    exceptionListener = reconnectExceptionListener;
-                } else {
-                    exceptionListener = new AggregatedExceptionListener(exceptionListener, reconnectExceptionListener);
-                }
-                conn.setExceptionListener(exceptionListener);
-            }
-            answer = new MessageConsumerResources(session, messageConsumer);
-            consumers.compute(conn, (key, oldValue) -> {
-                if (oldValue == null) {
-                    oldValue = new ArrayList<>();
-                }
-                oldValue.add(answer);
-                return oldValue;
-            });
-        } catch (Exception e) {
-            LOG.error("Unable to create the MessageConsumer", e);
-            throw e;
-        } finally {
-            connectionResource.returnConnection(conn);
-        }
-    }
-
-    /**
-     * Helper factory method used to create a MessageListener based on the MEP
-     *
-     * @param  session a session is only required if we are a transacted consumer
-     * @return         the listener
-     */
-    protected MessageListener createMessageHandler(Session session) {
-        TransactionCommitStrategy commitStrategy;
-        if (getTransactionCommitStrategy() != null) {
-            commitStrategy = getTransactionCommitStrategy();
-        } else {
-            commitStrategy = new DefaultTransactionCommitStrategy();
-        }
 
-        Synchronization synchronization = new SessionTransactionSynchronization(null, session, commitStrategy, false);
-
-        AbstractMessageHandler messageHandler;
-        if (getEndpoint().getExchangePattern().equals(ExchangePattern.InOnly)) {
-            if (isTransacted() || isSynchronous()) {
-                messageHandler = new InOnlyMessageHandler(getEndpoint(), scheduler, synchronization);
-            } else {
-                messageHandler = new InOnlyMessageHandler(getEndpoint(), scheduler);
-            }
-        } else {
-            if (isTransacted() || isSynchronous()) {
-                messageHandler = new InOutMessageHandler(getEndpoint(), scheduler, synchronization);
+                    @Override
+                    public String toString() {
+                        return "AsyncStopListenerTask[" + getDestinationName() + "]";
+                    }
+                });
             } else {
-                messageHandler = new InOutMessageHandler(getEndpoint(), scheduler);
+                stopAndDestroyListenerContainer();
             }
         }
 
-        messageHandler.setSession(session);
-        messageHandler.setProcessor(getAsyncProcessor());
-        messageHandler.setSynchronous(isSynchronous());
-        messageHandler.setTransacted(isTransacted());
-        messageHandler.setSharedJMSSession(isSharedJMSSession());
-        messageHandler.setTopic(isTopic());
-        return messageHandler;
+        super.doStop();
     }
 
-    /**
-     * @deprecated use {@link #getOrCreateConnectionResource()}
-     */
-    @Deprecated
-    protected ConnectionResource getConnectionResource() {
-        return getEndpoint().getConnectionResource();
-    }
+    protected void prepareAndStartListenerContainer() {
+        listenerContainer.afterPropertiesConfigured(getEndpoint().getCamelContext());
 
-    protected ConnectionResource getOrCreateConnectionResource() {
-        ConnectionResource answer = getEndpoint().getConnectionResource();
-        if (answer == null) {
-            answer = getEndpoint().createConnectionResource(this);
+        // only start listener if auto start is enabled or we are explicit invoking start later
+        if (initialized || getEndpoint().isAutoStartup()) {
+            // should we pre test connections before starting?
+            if (getEndpoint().isTestConnectionOnStartup()) {
+                testConnectionOnStartup();
+            }
+            startListenerContainer();
         }
-        return answer;
-    }
-
-    public int getAcknowledgementMode() {
-        return getEndpoint().getAcknowledgementMode().intValue();
-    }
-
-    /**
-     * Use to determine if transactions are enabled or disabled.
-     *
-     * @return true if transacted, otherwise false
-     */
-    public boolean isTransacted() {
-        return getEndpoint().isTransacted();
-    }
-
-    /**
-     * Use to determine if JMS session should be propagated to share with other SJMS endpoints.
-     *
-     * @return true if shared, otherwise false
-     */
-    public boolean isSharedJMSSession() {
-        return getEndpoint().isSharedJMSSession();
     }
 
     /**
-     * Use to determine whether or not to process exchanges synchronously.
+     * Pre tests the connection before starting the listening.
+     * <p/>
+     * In case of connection failure the exception is thrown which prevents Camel from starting.
      *
-     * @return true if synchronous
+     * @throws FailedToCreateConsumerException is thrown if testing the connection failed
      */
-    public boolean isSynchronous() {
-        return getEndpoint().isSynchronous();
+    protected void testConnectionOnStartup() throws FailedToCreateConsumerException {
+        try {
+            LOG.debug("Testing JMS Connection on startup for destination: {}", getDestinationName());
+            Connection con = listenerContainer.getConnectionFactory().createConnection();
+            closeConnection(con);
+            LOG.debug("Successfully tested JMS Connection on startup for destination: {}", getDestinationName());
+        } catch (Exception e) {
+            String msg = "Cannot get JMS Connection on startup for destination " + getDestinationName();
+            throw new FailedToCreateConsumerException(getEndpoint(), msg, e);
+        }
     }
 
-    /**
-     * The destination name for this consumer.
-     *
-     * @return String
-     */
-    public String getDestinationName() {
+    private String getDestinationName() {
         return getEndpoint().getDestinationName();
     }
 
     /**
-     * Returns the number of consumer listeners.
-     *
-     * @return the consumerCount
-     */
-    public int getConsumerCount() {
-        return getEndpoint().getConsumerCount();
-    }
-
-    /**
-     * Flag set by the endpoint used by consumers and producers to determine if the consumer is a JMS Topic.
-     *
-     * @return the topic true if consumer is a JMS Topic, default is false
-     */
-    public boolean isTopic() {
-        return getEndpoint().isTopic();
-    }
-
-    /**
-     * Gets the JMS Message selector syntax.
-     */
-    public String getMessageSelector() {
-        return getEndpoint().getMessageSelector();
-    }
-
-    /**
-     * Gets the durable subscription Id.
-     *
-     * @return the durableSubscriptionId
+     * Starts the JMS listener container
+     * <p/>
+     * Can be used to start this consumer later if it was configured to not auto startup.
      */
-    public String getDurableSubscriptionId() {
-        return getEndpoint().getDurableSubscriptionId();
-    }
-
-    /**
-     * Gets the commit strategy.
-     *
-     * @return the transactionCommitStrategy
-     */
-    public TransactionCommitStrategy getTransactionCommitStrategy() {
-        return getEndpoint().getTransactionCommitStrategy();
-    }
-
-    private boolean refillPool(BackOffTimer.Task task) {
-        LOG.debug("Refill consumers pool task running");
-        try {
-            fillConsumersPool();
-            LOG.info("Refill consumers pool completed (attempt: {})", task.getCurrentAttempts());
-            return false;
-        } catch (Exception ex) {
-            LOG.warn(
-                    "Refill consumers pool failed (attempt: {}) due to: {}. Will try again in {} millis. (stacktrace in DEBUG level)",
-                    task.getCurrentAttempts(), ex.getMessage(), task.getCurrentDelay());
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("Refill consumers pool failed", ex);
-            }
-        }
-        return true;
+    public void startListenerContainer() {
+        LOG.trace("Starting listener container {} on destination {}", listenerContainer, getDestinationName());
+        ServiceHelper.startService(listenerContainer);
+        LOG.debug("Started listener container {} on destination {}", listenerContainer, getDestinationName());
     }
 
-    private void scheduleRefill() {
-        if (rescheduleTask == null || rescheduleTask.getStatus() != BackOffTimer.Task.Status.Active) {
-            BackOff backOff = BackOff.builder().delay(getEndpoint().getReconnectBackOff()).build();
-            rescheduleTask = new BackOffTimer(scheduler).schedule(backOff, this::refillPool);
+    protected void stopAndDestroyListenerContainer() {
+        if (listenerContainer != null) {
+            ServiceHelper.stopAndShutdownService(listenerContainer);
         }
+        initialized = false;
     }
 
-    private final class ReconnectExceptionListener implements ExceptionListener {
-        private final WeakReference<Connection> connection;
-
-        private ReconnectExceptionListener(Connection connection) {
-            this.connection = new WeakReference<>(connection);
-        }
-
-        @Override
-        public void onException(JMSException exception) {
-            LOG.debug("Handling JMSException for reconnecting", exception);
-            Connection currentConnection = connection.get();
-            if (currentConnection != null) {
-                synchronized (consumers) {
-                    List<MessageConsumerResources> toClose = consumers.get(currentConnection);
-                    if (toClose != null) {
-                        toClose.forEach(SjmsConsumer.this::destroyObject);
-                    }
-                    consumers.remove(currentConnection);
-                }
-                scheduleRefill();
-            }
-        }
-
-        //hash and equals to prevent multiple instances for same connection
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            ReconnectExceptionListener that = (ReconnectExceptionListener) o;
-            return Objects.equals(connection.get(), that.connection.get());
-        }
-
-        @Override
-        public int hashCode() {
-            final Connection currentConnection = this.connection.get();
-            return currentConnection == null ? 0 : currentConnection.hashCode();
-        }
-    }
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
index 84a8b03..ee3c230 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
@@ -16,7 +16,10 @@
  */
 package org.apache.camel.component.sjms;
 
+import java.util.concurrent.ExecutorService;
+
 import javax.jms.ConnectionFactory;
+import javax.jms.DeliveryMode;
 import javax.jms.ExceptionListener;
 import javax.jms.Message;
 import javax.jms.Session;
@@ -32,6 +35,8 @@ import org.apache.camel.MultipleConsumersSupport;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.component.sjms.consumer.EndpointMessageListener;
+import org.apache.camel.component.sjms.consumer.SimpleMessageListenerContainer;
 import org.apache.camel.component.sjms.jms.ConnectionFactoryResource;
 import org.apache.camel.component.sjms.jms.ConnectionResource;
 import org.apache.camel.component.sjms.jms.DefaultDestinationCreationStrategy;
@@ -78,10 +83,6 @@ public class SjmsEndpoint extends DefaultEndpoint
     @UriPath(description = "DestinationName is a JMS queue or topic name. By default, the destinationName is interpreted as a queue name.")
     @Metadata(required = true)
     private String destinationName;
-    // TODO: get rid of synchronous true for consumer
-    @UriParam(label = "consumer", defaultValue = "true",
-              description = "Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).")
-    private boolean synchronous = true;
     @UriParam(label = "advanced",
               description = "To use a custom HeaderFilterStrategy to filter header to and from Camel message.")
     private HeaderFilterStrategy headerFilterStrategy;
@@ -139,6 +140,19 @@ public class SjmsEndpoint extends DefaultEndpoint
     @UriParam(defaultValue = "true", label = "consumer",
               description = "Specifies whether to use persistent delivery by default for replies.")
     private boolean replyToDeliveryPersistent = true;
+    @UriParam(label = "consumer,advanced", defaultValue = "Poison JMS message due to ${exception.message}",
+              description = "If eagerLoadingOfProperties is enabled and the JMS message payload (JMS body or JMS properties) is poison (cannot be read/mapped),"
+                            + " then set this text as the message body instead so the message can be processed"
+                            + " (the cause of the poison are already stored as exception on the Exchange)."
+                            + " This can be turned off by setting eagerPoisonBody=false."
+                            + " See also the option eagerLoadingOfProperties.")
+    private String eagerPoisonBody = "Poison JMS message payload: ${exception.message}";
+    @UriParam(label = "consumer,advanced",
+              description = "Enables eager loading of JMS properties and payload as soon as a message is loaded"
+                            + " which generally is inefficient as the JMS properties may not be required"
+                            + " but sometimes can catch early any issues with the underlying JMS provider"
+                            + " and the use of JMS properties. See also the option eagerPoisonBody.")
+    private boolean eagerLoadingOfProperties;
     @UriParam(enums = "1,2", label = "producer",
               description = "Specifies the delivery mode to be used."
                             + " Possible values are those defined by javax.jms.DeliveryMode."
@@ -159,6 +173,12 @@ public class SjmsEndpoint extends DefaultEndpoint
     @UriParam(label = "consumer,advanced",
               description = "Sets the JMS Message selector syntax.")
     private String messageSelector;
+    @UriParam(description = "Specifies whether to test the connection on startup."
+                            + " This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker."
+                            + " If a connection cannot be granted then Camel throws an exception on startup."
+                            + " This ensures that Camel is not started with failed connections."
+                            + " The JMS producers is tested as well.")
+    private boolean testConnectionOnStartup;
     @UriParam(label = "advanced",
               description = "Whether to startup the consumer message listener asynchronously, when starting a route."
                             + " For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover."
@@ -169,6 +189,13 @@ public class SjmsEndpoint extends DefaultEndpoint
     @UriParam(label = "advanced",
               description = "Whether to stop the consumer message listener asynchronously, when stopping a route.")
     private boolean asyncStopListener;
+    @UriParam(label = "consumer", defaultValue = "true",
+              description = "Specifies whether the consumer container should auto-startup.")
+    private boolean autoStartup = true;
+    @UriParam(label = "consumer,advanced",
+              description = "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.")
+    private boolean replyToSameDestinationAllowed;
     @UriParam(label = "producer,advanced", defaultValue = "true",
               description = "Whether to allow sending messages with no body. If this option is false and the message body is null, then an JMSException is thrown.")
     private boolean allowNullBody = true;
@@ -210,14 +237,39 @@ public class SjmsEndpoint extends DefaultEndpoint
     @UriParam(defaultValue = "true", label = "consumer,logging",
               description = "Allows to control whether stacktraces should be logged or not, by the default errorHandler.")
     private boolean errorHandlerLogStackTrace = true;
-    @UriParam(label = "consumer", description = "Try to apply reconnection logic on consumer pool", defaultValue = "true")
-    private boolean reconnectOnError = true;
-    @UriParam(label = "consumer", javaType = "java.time.Duration",
-              description = "Backoff in millis on consumer pool reconnection attempts", defaultValue = "5000")
-    private long reconnectBackOff = 5000;
-
-    @Deprecated
-    private volatile boolean closeConnectionResource;
+    @UriParam(defaultValue = "5000", label = "advanced", javaType = "java.time.Duration",
+              description = "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds."
+                            + " The default is 5000 ms, that is, 5 seconds.")
+    private long recoveryInterval = 5000;
+    @UriParam(label = "advanced",
+              description = "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side,"
+                            + " then the caused Exception will be send back in response as a javax.jms.ObjectMessage."
+                            + " If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge"
+                            + " in your routing - for example, using persistent queues to enable robust routing."
+                            + " Notice that if you also have transferExchange enabled, this option takes precedence."
+                            + " The caught exception is required to be serializable."
+                            + " The original Exception on the consumer side can be wrapped in an outer exception"
+                            + " such as org.apache.camel.RuntimeCamelException when returned to the producer."
+                            + " Use this with caution as the data is using Java Object serialization and requires the received to be able to deserialize the data at Class level, "
+                            + " which forces a strong coupling between the producers and consumer!")
+    private boolean transferException;
+    @UriParam(label = "producer,advanced",
+              description = "Use this option to force disabling time to live."
+                            + " For example when you do request/reply over JMS, then Camel will by default use the requestTimeout value"
+                            + " as time to live on the message being sent. The problem is that the sender and receiver systems have"
+                            + " to have their clocks synchronized, so they are in sync. This is not always so easy to archive."
+                            + " So you can use disableTimeToLive=true to not set a time to live value on the sent message."
+                            + " Then the message will not expire on the receiver system. See below in section About time to live for more details.")
+    private boolean disableTimeToLive;
+    @UriParam(label = "consumer",
+              description = "Whether the JmsConsumer processes the Exchange asynchronously."
+                            + " If enabled then the JmsConsumer may pickup the next message from the JMS queue,"
+                            + " while the previous message is being processed asynchronously (by the Asynchronous Routing Engine)."
+                            + " This means that messages may be processed not 100% strictly in order. If disabled (as default)"
+                            + " then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue."
+                            + " Note if transacted has been enabled, then asyncConsumer=true does not run asynchronously, as transaction"
+                            + "  must be executed synchronously (Camel 3.0 may support async transactions).")
+    private boolean asyncConsumer;
 
     private JmsObjectFactory jmsObjectFactory = new Jms11ObjectFactory();
 
@@ -226,7 +278,6 @@ public class SjmsEndpoint extends DefaultEndpoint
 
     public SjmsEndpoint(String uri, Component component, String remaining) {
         super(uri, component);
-        // TODO: optimize for dynamic destination name via toD (eg ${ } somewhere)
         this.topic = DestinationNameParser.isTopic(remaining);
         this.destinationName = DestinationNameParser.getShortName(remaining);
     }
@@ -250,9 +301,25 @@ public class SjmsEndpoint extends DefaultEndpoint
 
     @Override
     public Consumer createConsumer(Processor processor) throws Exception {
-        SjmsConsumer answer = new SjmsConsumer(this, processor);
-        configureConsumer(answer);
-        return answer;
+        EndpointMessageListener listener = new EndpointMessageListener(this, processor);
+        if (isDisableReplyTo()) {
+            listener.setDisableReplyTo(true);
+        }
+        if (!"false".equals(eagerPoisonBody)) {
+            listener.setEagerPoisonBody(eagerPoisonBody);
+        }
+        listener.setEagerLoadingOfProperties(eagerLoadingOfProperties);
+        if (getReplyTo() != null) {
+            listener.setReplyToDestination(getReplyTo());
+        }
+        listener.setAsync(isAsyncConsumer());
+
+        MessageListenerContainer container = createMessageListenerContainer(this);
+        container.setMessageListener(listener);
+
+        SjmsConsumer consumer = new SjmsConsumer(this, processor, container);
+        configureConsumer(consumer);
+        return consumer;
     }
 
     @Override
@@ -298,6 +365,48 @@ public class SjmsEndpoint extends DefaultEndpoint
     }
 
     /**
+     * Factory method for creating a new template for InOnly message exchanges
+     */
+    public SjmsTemplate createInOnlyTemplate() {
+        // TODO: Add isPubSub, Destination as parameters so we can have a default destination
+        SjmsTemplate template = new SjmsTemplate(getConnectionFactory(), isTransacted(), getAcknowledgementMode().intValue());
+
+        // configure qos if enabled
+        if (isExplicitQosEnabled()) {
+            int dm = isDeliveryPersistent() ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT;
+            if (getDeliveryMode() != null) {
+                dm = getDeliveryMode();
+            }
+            template.setQoSSettings(dm, getPriority(), getTimeToLive());
+        }
+
+        return template;
+    }
+
+    /**
+     * Factory method for creating a new template for InOut message exchanges
+     */
+    public SjmsTemplate createInOutTemplate() {
+        // TODO: Add isPubSub, Destination as parameters so we can have a default destination
+        SjmsTemplate template = createInOnlyTemplate();
+        if (getRequestTimeout() > 0) {
+            template.setExplicitQosEnabled(true);
+
+            // prefer to use timeToLive over requestTimeout if both specified
+            long ttl = getTimeToLive() > 0 ? getTimeToLive() : getRequestTimeout();
+            if (!isDisableTimeToLive()) {
+                // only use TTL if not disabled
+                template.setQoSSettings(0, 0, ttl);
+            }
+        }
+        return template;
+    }
+
+    public MessageListenerContainer createMessageListenerContainer(SjmsEndpoint endpoint) throws Exception {
+        return new SimpleMessageListenerContainer(endpoint);
+    }
+
+    /**
      * When one of the QoS properties are configured such as {@link #setDeliveryPersistent(boolean)},
      * {@link #setPriority(int)} or {@link #setTimeToLive(long)} then we should auto default the setting of
      * {@link #setExplicitQosEnabled(Boolean)} if its not been configured yet
@@ -339,6 +448,15 @@ public class SjmsEndpoint extends DefaultEndpoint
         this.binding = binding;
     }
 
+    protected ExecutorService getAsyncStartStopExecutorService() {
+        if (getComponent() == null) {
+            throw new IllegalStateException(
+                    "AsyncStartStopListener requires JmsComponent to be configured on this endpoint: " + this);
+        }
+        // use shared thread pool from component
+        return getComponent().getAsyncStartStopExecutorService();
+    }
+
     /**
      * DestinationName is a JMS queue or topic name. By default, the destinationName is interpreted as a queue name.
      */
@@ -403,20 +521,6 @@ public class SjmsEndpoint extends DefaultEndpoint
                 = EndpointHelper.resolveReferenceParameter(getCamelContext(), connectionResource, ConnectionResource.class);
     }
 
-    @Override
-    public boolean isSynchronous() {
-        return synchronous;
-    }
-
-    /**
-     * Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing
-     * (if supported).
-     */
-    @Override
-    public void setSynchronous(boolean synchronous) {
-        this.synchronous = synchronous;
-    }
-
     public SessionAcknowledgementType getAcknowledgementMode() {
         return acknowledgementMode;
     }
@@ -501,6 +605,22 @@ public class SjmsEndpoint extends DefaultEndpoint
         this.replyToDeliveryPersistent = replyToDeliveryPersistent;
     }
 
+    public String getEagerPoisonBody() {
+        return eagerPoisonBody;
+    }
+
+    public boolean isEagerLoadingOfProperties() {
+        return eagerLoadingOfProperties;
+    }
+
+    public void setEagerLoadingOfProperties(boolean eagerLoadingOfProperties) {
+        this.eagerLoadingOfProperties = eagerLoadingOfProperties;
+    }
+
+    public void setEagerPoisonBody(String eagerPoisonBody) {
+        this.eagerPoisonBody = eagerPoisonBody;
+    }
+
     public Integer getDeliveryMode() {
         return deliveryMode;
     }
@@ -596,6 +716,14 @@ public class SjmsEndpoint extends DefaultEndpoint
         setExchangePattern(ExchangePattern.InOut);
     }
 
+    public boolean isTestConnectionOnStartup() {
+        return testConnectionOnStartup;
+    }
+
+    public void setTestConnectionOnStartup(boolean testConnectionOnStartup) {
+        this.testConnectionOnStartup = testConnectionOnStartup;
+    }
+
     /**
      * Whether to startup the consumer message listener asynchronously, when starting a route. For example if a
      * JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover.
@@ -623,6 +751,14 @@ public class SjmsEndpoint extends DefaultEndpoint
         return asyncStopListener;
     }
 
+    public boolean isAutoStartup() {
+        return autoStartup;
+    }
+
+    public void setAutoStartup(boolean autoStartup) {
+        this.autoStartup = autoStartup;
+    }
+
     public DestinationCreationStrategy getDestinationCreationStrategy() {
         return destinationCreationStrategy;
     }
@@ -634,6 +770,14 @@ public class SjmsEndpoint extends DefaultEndpoint
         this.destinationCreationStrategy = destinationCreationStrategy;
     }
 
+    public boolean isReplyToSameDestinationAllowed() {
+        return replyToSameDestinationAllowed;
+    }
+
+    public void setReplyToSameDestinationAllowed(boolean replyToSameDestinationAllowed) {
+        this.replyToSameDestinationAllowed = replyToSameDestinationAllowed;
+    }
+
     public boolean isAllowNullBody() {
         return allowNullBody;
     }
@@ -766,25 +910,35 @@ public class SjmsEndpoint extends DefaultEndpoint
         this.jmsObjectFactory = jmsObjectFactory;
     }
 
-    public boolean isReconnectOnError() {
-        return reconnectOnError;
+    public boolean isTransferException() {
+        return transferException;
     }
 
-    /**
-     * Try to apply reconnection logic on consumer pool
-     */
-    public void setReconnectOnError(boolean reconnectOnError) {
-        this.reconnectOnError = reconnectOnError;
+    public void setTransferException(boolean transferException) {
+        this.transferException = transferException;
     }
 
-    public long getReconnectBackOff() {
-        return reconnectBackOff;
+    public boolean isDisableTimeToLive() {
+        return disableTimeToLive;
     }
 
-    /**
-     * Backoff in millis on consumer pool reconnection attempts
-     */
-    public void setReconnectBackOff(long reconnectBackOff) {
-        this.reconnectBackOff = reconnectBackOff;
+    public void setDisableTimeToLive(boolean disableTimeToLive) {
+        this.disableTimeToLive = disableTimeToLive;
+    }
+
+    public long getRecoveryInterval() {
+        return recoveryInterval;
+    }
+
+    public void setRecoveryInterval(long recoveryInterval) {
+        this.recoveryInterval = recoveryInterval;
+    }
+
+    public boolean isAsyncConsumer() {
+        return asyncConsumer;
+    }
+
+    public void setAsyncConsumer(boolean asyncConsumer) {
+        this.asyncConsumer = asyncConsumer;
     }
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsHelper.java
new file mode 100644
index 0000000..bff6ecc
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsHelper.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+
+public final class SjmsHelper {
+
+    private SjmsHelper() {
+    }
+
+    public static void closeProducer(MessageProducer producer) {
+        if (producer != null) {
+            try {
+                producer.close();
+            } catch (Throwable e) {
+                // ignore
+            }
+        }
+    }
+
+    public static void closeConnection(Connection con) {
+        if (con != null) {
+            try {
+                con.close();
+            } catch (Throwable e) {
+                // ignore
+            }
+        }
+    }
+
+    public static void closeSession(Session ses) {
+        if (ses != null) {
+            try {
+                ses.close();
+            } catch (Throwable e) {
+                // ignore
+            }
+        }
+    }
+
+    public static void closeConsumer(MessageConsumer consumer) {
+        if (consumer != null) {
+            boolean interrupted = Thread.interrupted();
+            try {
+                consumer.close();
+            } catch (JMSException ex) {
+                // ignore
+            } finally {
+                if (interrupted) {
+                    Thread.currentThread().interrupt();
+                }
+            }
+        }
+    }
+
+    public static void commitIfNecessary(Session session) throws JMSException {
+        try {
+            session.commit();
+        } catch (javax.jms.TransactionInProgressException | javax.jms.IllegalStateException ex) {
+            // ignore
+        }
+    }
+
+    public static void rollbackIfNecessary(Session session) throws JMSException {
+        try {
+            session.rollback();
+        } catch (javax.jms.TransactionInProgressException | javax.jms.IllegalStateException ex) {
+            // ignore
+        }
+    }
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
index 3ed1034..6bc7d80 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
@@ -20,7 +20,6 @@ import javax.jms.Connection;
 import javax.jms.DeliveryMode;
 import javax.jms.Destination;
 import javax.jms.JMSException;
-import javax.jms.MessageProducer;
 import javax.jms.Session;
 
 import org.apache.camel.AsyncCallback;
@@ -173,14 +172,4 @@ public abstract class SjmsProducer extends DefaultAsyncProducer {
         return null;
     }
 
-    protected static void close(MessageProducer producer) {
-        if (producer != null) {
-            try {
-                producer.close();
-            } catch (Throwable e) {
-                // ignore
-            }
-        }
-    }
-
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java
index 6461c6e..902ce6e 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java
@@ -58,6 +58,10 @@ public class SjmsTemplate {
         }
     }
 
+    public void setExplicitQosEnabled(boolean explicitQosEnabled) {
+        this.explicitQosEnabled = explicitQosEnabled;
+    }
+
     public <T> T execute(SessionCallback<T> sessionCallback) throws Exception {
         Connection con = null;
         Session session = null;
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java
index 2a1380d..0eecf31 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java
@@ -36,6 +36,7 @@ import static org.apache.camel.RuntimeCamelException.wrapRuntimeCamelException;
 /**
  * Abstract MessageListener
  */
+@Deprecated
 public abstract class AbstractMessageHandler implements MessageListener {
 
     protected final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/EndpointMessageListener.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/EndpointMessageListener.java
new file mode 100644
index 0000000..055365c
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/EndpointMessageListener.java
@@ -0,0 +1,430 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms.consumer;
+
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.AsyncProcessor;
+import org.apache.camel.CamelExchangeException;
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
+import org.apache.camel.RollbackExchangeException;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.component.sjms.SessionMessageListener;
+import org.apache.camel.component.sjms.SjmsEndpoint;
+import org.apache.camel.component.sjms.SjmsTemplate;
+import org.apache.camel.component.sjms.jms.JmsMessageHelper;
+import org.apache.camel.support.AsyncProcessorConverterHelper;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.RuntimeCamelException.wrapRuntimeCamelException;
+
+/**
+ * A JMS {@link MessageListener} which can be used to delegate processing to a Camel endpoint.
+ *
+ * Note that instance of this object has to be thread safe (reentrant)
+ */
+public class EndpointMessageListener implements SessionMessageListener {
+
+    private static final Logger LOG = LoggerFactory.getLogger(EndpointMessageListener.class);
+
+    private final SjmsEndpoint endpoint;
+    private final AsyncProcessor processor;
+    private Object replyToDestination;
+    private boolean disableReplyTo;
+    private boolean async;
+    private boolean eagerLoadingOfProperties;
+    private String eagerPoisonBody;
+    private volatile SjmsTemplate template;
+
+    public EndpointMessageListener(SjmsEndpoint endpoint, Processor processor) {
+        this.endpoint = endpoint;
+        this.processor = AsyncProcessorConverterHelper.convert(processor);
+    }
+
+    public synchronized SjmsTemplate getTemplate() {
+        if (template == null) {
+            template = endpoint.createInOnlyTemplate();
+        }
+        return template;
+    }
+
+    public void setTemplate(SjmsTemplate template) {
+        this.template = template;
+    }
+
+    public Object getReplyToDestination() {
+        return replyToDestination;
+    }
+
+    public void setReplyToDestination(Object replyToDestination) {
+        this.replyToDestination = replyToDestination;
+    }
+
+    public boolean isDisableReplyTo() {
+        return disableReplyTo;
+    }
+
+    public void setDisableReplyTo(boolean disableReplyTo) {
+        this.disableReplyTo = disableReplyTo;
+    }
+
+    public boolean isAsync() {
+        return async;
+    }
+
+    public void setAsync(boolean async) {
+        this.async = async;
+    }
+
+    public boolean isEagerLoadingOfProperties() {
+        return eagerLoadingOfProperties;
+    }
+
+    public void setEagerLoadingOfProperties(boolean eagerLoadingOfProperties) {
+        this.eagerLoadingOfProperties = eagerLoadingOfProperties;
+    }
+
+    public String getEagerPoisonBody() {
+        return eagerPoisonBody;
+    }
+
+    public void setEagerPoisonBody(String eagerPoisonBody) {
+        this.eagerPoisonBody = eagerPoisonBody;
+    }
+
+    @Override
+    public void onMessage(Message message, Session session) {
+        LOG.trace("onMessage START");
+
+        LOG.debug("{} consumer received JMS message: {}", endpoint, message);
+
+        boolean sendReply;
+        RuntimeCamelException rce;
+        try {
+            Object replyDestination = getReplyToDestination(message);
+            // we can only send back a reply if there was a reply destination configured
+            // and disableReplyTo hasn't been explicit enabled
+            sendReply = replyDestination != null && !disableReplyTo;
+
+            // we should also not send back reply to ourself if this destination and replyDestination is the same
+            Destination destination = JmsMessageHelper.getJMSDestination(message);
+            if (destination != null && sendReply && !endpoint.isReplyToSameDestinationAllowed()
+                    && destination.equals(replyDestination)) {
+                LOG.debug("JMSDestination and JMSReplyTo is the same, will skip sending a reply message to itself: {}",
+                        destination);
+                sendReply = false;
+            }
+
+            final Exchange exchange = createExchange(message, session, replyDestination);
+            if (ObjectHelper.isNotEmpty(eagerPoisonBody) && eagerLoadingOfProperties) {
+                try {
+                    exchange.getIn().getBody();
+                    exchange.getIn().getHeaders();
+                } catch (Throwable e) {
+                    // any problems with eager loading then set an exception so Camel error handler can react
+                    exchange.setException(e);
+                    String text = eagerPoisonBody;
+                    try {
+                        text = endpoint.getCamelContext().resolveLanguage("simple")
+                                .createExpression(eagerPoisonBody).evaluate(exchange, String.class);
+                    } catch (Throwable t) {
+                        // ignore
+                    }
+                    exchange.getIn().setBody(text);
+                }
+            } else if (eagerLoadingOfProperties) {
+                exchange.getIn().getBody();
+                exchange.getIn().getHeaders();
+            }
+
+            String correlationId = message.getJMSCorrelationID();
+            if (correlationId != null) {
+                LOG.debug("Received Message has JMSCorrelationID [{}]", correlationId);
+            }
+
+            // process the exchange either asynchronously or synchronous
+            LOG.trace("onMessage.process START");
+            AsyncCallback callback
+                    = new EndpointMessageListenerAsyncCallback(
+                            session, message, exchange, endpoint, sendReply, replyDestination);
+
+            // async is by default false, which mean we by default will process the exchange synchronously
+            // to keep backwards compatible, as well ensure this consumer will pickup messages in order
+            // (eg to not consume the next message before the previous has been fully processed)
+            // but if end user explicit configure consumerAsync=true, then we can process the message
+            // asynchronously (unless endpoint has been configured synchronous, or we use transaction)
+            boolean forceSync = endpoint.isSynchronous() || endpoint.isTransacted();
+            if (forceSync || !isAsync()) {
+                // must process synchronous if transacted or configured to do so
+                if (LOG.isTraceEnabled()) {
+                    LOG.trace("Processing exchange {} synchronously", exchange.getExchangeId());
+                }
+                try {
+                    processor.process(exchange);
+                } catch (Exception e) {
+                    exchange.setException(e);
+                } finally {
+                    callback.done(true);
+                }
+            } else {
+                // process asynchronous using the async routing engine
+                if (LOG.isTraceEnabled()) {
+                    LOG.trace("Processing exchange {} asynchronously", exchange.getExchangeId());
+                }
+                boolean sync = processor.process(exchange, callback);
+                if (!sync) {
+                    // will be done async so return now
+                    return;
+                }
+            }
+            // if we failed processed the exchange from the async callback task, then grab the exception
+            rce = exchange.getException(RuntimeCamelException.class);
+
+        } catch (Exception e) {
+            rce = wrapRuntimeCamelException(e);
+        }
+
+        // an exception occurred so rethrow to trigger rollback on JMS listener
+        // the JMS listener will use the error handler to handle the uncaught exception
+        if (rce != null) {
+            LOG.trace("onMessage END throwing exception: {}", rce.getMessage());
+            // Spring message listener container will handle uncaught exceptions
+            // being thrown from this onMessage, and will us the ErrorHandler configured
+            // on the JmsEndpoint to handle the exception
+            throw rce;
+        }
+
+        LOG.trace("onMessage END");
+    }
+
+    protected Object getReplyToDestination(Message message) throws JMSException {
+        // lets send a response back if we can
+        Object destination = getReplyToDestination();
+        if (destination == null) {
+            destination = JmsMessageHelper.getJMSReplyTo(message);
+        }
+        return destination;
+    }
+
+    public Exchange createExchange(Message message, Session session, Object replyDestination) {
+        Exchange exchange = endpoint.createExchange(message, session);
+
+        // lets set to an InOut if we have some kind of reply-to destination
+        if (replyDestination != null && !disableReplyTo) {
+            // only change pattern if not already out capable
+            if (!exchange.getPattern().isOutCapable()) {
+                exchange.setPattern(ExchangePattern.InOut);
+            }
+        }
+        return exchange;
+    }
+
+    protected void sendReply(
+            Session session,
+            Destination replyDestination, final Message message, final Exchange exchange,
+            final org.apache.camel.Message out, final Exception cause) {
+        if (replyDestination == null) {
+            LOG.debug("Cannot send reply message as there is no replyDestination for: {}", out);
+            return;
+        }
+        try {
+            getTemplate().execute(session, sc -> {
+                MessageProducer producer = null;
+                try {
+                    Message reply = endpoint.getBinding().makeJmsMessage(exchange, out, sc, cause);
+                    final String correlationID = determineCorrelationId(message);
+                    reply.setJMSCorrelationID(correlationID);
+
+                    if (LOG.isDebugEnabled()) {
+                        LOG.debug("{} sending reply JMS message [correlationId:{}]: {}", endpoint, correlationID, reply);
+                    }
+
+                    producer = endpoint.getJmsObjectFactory().createMessageProducer(sc, endpoint, replyDestination);
+                    template.send(producer, reply);
+                } finally {
+                    close(producer);
+                }
+                return null;
+            });
+        } catch (Exception e) {
+            exchange.setException(new CamelExchangeException("Unable to send reply JMS message", exchange, e));
+        }
+    }
+
+    protected void sendReply(
+            Session session,
+            String replyDestination, final Message message, final Exchange exchange,
+            final org.apache.camel.Message out, final Exception cause) {
+        if (replyDestination == null) {
+            LOG.debug("Cannot send reply message as there is no replyDestination for: {}", out);
+            return;
+        }
+        try {
+            getTemplate().execute(session, sc -> {
+                MessageProducer producer = null;
+                try {
+                    Message reply = endpoint.getBinding().makeJmsMessage(exchange, out, sc, cause);
+                    final String correlationID = determineCorrelationId(message);
+                    reply.setJMSCorrelationID(correlationID);
+
+                    if (LOG.isDebugEnabled()) {
+                        LOG.debug("{} sending reply JMS message [correlationId:{}]: {}", endpoint, correlationID, reply);
+                    }
+
+                    producer = endpoint.getJmsObjectFactory().createMessageProducer(sc, endpoint, replyDestination);
+                    template.send(producer, reply);
+                } finally {
+                    close(producer);
+                }
+                return null;
+            });
+        } catch (Exception e) {
+            exchange.setException(new CamelExchangeException("Unable to send reply JMS message", exchange, e));
+        }
+    }
+
+    /**
+     * Strategy to determine which correlation id to use among <tt>JMSMessageID</tt> and <tt>JMSCorrelationID</tt>.
+     *
+     * @param  message      the JMS message
+     * @return              the correlation id to use
+     * @throws JMSException can be thrown
+     */
+    protected String determineCorrelationId(final Message message) throws JMSException {
+        final String messageId = message.getJMSMessageID();
+        final String correlationId = message.getJMSCorrelationID();
+
+        if (ObjectHelper.isEmpty(correlationId)) {
+            // correlation id is empty so fallback to message id
+            return messageId;
+        } else {
+            return correlationId;
+        }
+    }
+
+    protected static void close(MessageProducer producer) {
+        if (producer != null) {
+            try {
+                producer.close();
+            } catch (Throwable e) {
+                // ignore
+            }
+        }
+    }
+
+    /**
+     * Callback task that is performed when the exchange has been processed
+     */
+    private final class EndpointMessageListenerAsyncCallback implements AsyncCallback {
+
+        private final Session session;
+        private final Message message;
+        private final Exchange exchange;
+        private final SjmsEndpoint endpoint;
+        private final boolean sendReply;
+        private final Object replyDestination;
+
+        private EndpointMessageListenerAsyncCallback(Session session, Message message, Exchange exchange, SjmsEndpoint endpoint,
+                                                     boolean sendReply, Object replyDestination) {
+            this.session = session;
+            this.message = message;
+            this.exchange = exchange;
+            this.endpoint = endpoint;
+            this.sendReply = sendReply;
+            this.replyDestination = replyDestination;
+        }
+
+        @Override
+        public void done(boolean doneSync) {
+            LOG.trace("onMessage.process END");
+
+            // now we evaluate the processing of the exchange and determine if it was a success or failure
+            // we also grab information from the exchange to be used for sending back a reply (if we are to do so)
+            // so the following logic seems a bit complicated at first glance
+
+            // if we send back a reply it can either be the message body or transferring a caused exception
+            org.apache.camel.Message body = null;
+            Exception cause = null;
+            RuntimeCamelException rce = null;
+
+            if (exchange.isFailed() || exchange.isRollbackOnly()) {
+                if (exchange.isRollbackOnly()) {
+                    // rollback only so wrap an exception so we can rethrow the exception to cause rollback
+                    rce = wrapRuntimeCamelException(new RollbackExchangeException(exchange));
+                } else if (exchange.getException() != null) {
+                    // an exception occurred while processing
+                    if (endpoint.isTransferException()) {
+                        // send the exception as reply, so null body and set the exception as the cause
+                        body = null;
+                        cause = exchange.getException();
+                    } else {
+                        // only throw exception if endpoint is not configured to transfer exceptions back to caller
+                        // do not send a reply but wrap and rethrow the exception
+                        rce = wrapRuntimeCamelException(exchange.getException());
+                    }
+                }
+            } else {
+                // process OK so get the reply body if we are InOut and has a body
+                // If the ppl don't want to send the message back, he should use the InOnly
+                if (sendReply && exchange.getPattern().isOutCapable()) {
+                    if (exchange.hasOut()) {
+                        body = exchange.getOut();
+                    } else {
+                        body = exchange.getIn();
+                    }
+                    cause = null;
+                }
+            }
+
+            // send back reply if there was no error and we are supposed to send back a reply
+            if (rce == null && sendReply && (body != null || cause != null)) {
+                LOG.trace("onMessage.sendReply START");
+                if (replyDestination instanceof Destination) {
+                    sendReply(session, (Destination) replyDestination, message, exchange, body, cause);
+                } else {
+                    sendReply(session, (String) replyDestination, message, exchange, body, cause);
+                }
+                LOG.trace("onMessage.sendReply END");
+            }
+
+            // if an exception occurred
+            if (rce != null) {
+                if (doneSync) {
+                    // we were done sync, so put exception on exchange, so we can grab it in the onMessage
+                    // method and rethrow it
+                    exchange.setException(rce);
+                } else {
+                    // we were done async, so use the exception handler
+                    if (endpoint.getExceptionHandler() != null) {
+                        endpoint.getExceptionHandler().handleException(rce);
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java
index 11676aa..0d9db8c 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java
@@ -26,6 +26,7 @@ import org.apache.camel.spi.Synchronization;
 /**
  * An InOnly {@link AbstractMessageHandler}
  */
+@Deprecated
 public class InOnlyMessageHandler extends AbstractMessageHandler {
 
     public InOnlyMessageHandler(SjmsEndpoint endpoint, ExecutorService executor) {
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java
index c965874..d964be1 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java
@@ -38,6 +38,7 @@ import org.apache.camel.spi.Synchronization;
 /**
  * cache manager to store and purge unused cashed producers or we will have a memory leak
  */
+@Deprecated
 public class InOutMessageHandler extends AbstractMessageHandler {
 
     private Map<String, MessageProducer> producerCache = new TreeMap<>();
@@ -163,8 +164,7 @@ public class InOutMessageHandler extends AbstractMessageHandler {
         public void done(boolean sync) {
             try {
                 org.apache.camel.Message msg = exchange.getMessage();
-                Message response = getEndpoint().getBinding().makeJmsMessage(exchange, msg.getBody(), msg.getHeaders(),
-                        getSession(), null);
+                Message response = getEndpoint().getBinding().makeJmsMessage(exchange, msg, getSession(), null);
                 response.setJMSCorrelationID(exchange.getIn().getHeader(JmsConstants.JMS_CORRELATION_ID, String.class));
                 localProducer.send(response);
             } catch (Exception e) {
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java
new file mode 100644
index 0000000..e5ee4b2
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java
@@ -0,0 +1,302 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms.consumer;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ScheduledExecutorService;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.Session;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.sjms.SessionMessageListener;
+import org.apache.camel.component.sjms.SjmsEndpoint;
+import org.apache.camel.component.sjms.SjmsHelper;
+import org.apache.camel.support.service.ServiceSupport;
+import org.apache.camel.util.backoff.BackOff;
+import org.apache.camel.util.backoff.BackOffTimer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.component.sjms.SjmsHelper.*;
+
+public class SimpleMessageListenerContainer extends ServiceSupport
+        implements org.apache.camel.component.sjms.MessageListenerContainer, ExceptionListener {
+
+    private static final Logger LOG = LoggerFactory.getLogger(SimpleMessageListenerContainer.class);
+
+    private final SjmsEndpoint endpoint;
+    private SessionMessageListener messageListener;
+
+    // TODO: transaction
+    // TODO: Add concurrency later
+    private int concurrentConsumers = 1;
+
+    private final Object connectionLock = new Object();
+    private Connection connection;
+    private volatile boolean connectionStarted;
+    private final Object consumerLock = new Object();
+    private Set<MessageConsumer> consumers;
+    private Set<Session> sessions;
+
+    private BackOffTimer.Task recoverTask;
+    private ScheduledExecutorService scheduler;
+
+    public SimpleMessageListenerContainer(SjmsEndpoint endpoint) {
+        this.endpoint = endpoint;
+    }
+
+    public void setMessageListener(SessionMessageListener messageListener) {
+        this.messageListener = messageListener;
+    }
+
+    @Override
+    public void afterPropertiesConfigured(CamelContext camelContext) {
+        // noop
+    }
+
+    @Override
+    public ConnectionFactory getConnectionFactory() {
+        return endpoint.getConnectionFactory();
+    }
+
+    protected void configureConsumer(MessageConsumer consumer, Session session) throws Exception {
+        consumer.setMessageListener(new SimpleMessageListener(messageListener, session));
+    }
+
+    private class SimpleMessageListener implements MessageListener {
+
+        private final SessionMessageListener messageListener;
+        private final Session session;
+
+        public SimpleMessageListener(SessionMessageListener messageListener, Session session) {
+            this.messageListener = messageListener;
+            this.session = session;
+        }
+
+        @Override
+        public void onMessage(Message message) {
+            try {
+                doOnMessage(message);
+            } catch (Throwable e) {
+                if (e instanceof JMSException) {
+                    if (endpoint.getExceptionListener() != null) {
+                        endpoint.getExceptionListener().onException((JMSException) e);
+                    }
+                } else {
+                    LOG.warn("Execution of JMS message listener failed. This exception is ignored.", e);
+                }
+            }
+        }
+
+        protected void doOnMessage(Message message) throws Exception {
+            try {
+                messageListener.onMessage(message, session);
+            } catch (Exception e) {
+                // unexpected error so rollback
+                rollbackIfNeeded(session);
+                throw e;
+            }
+            // success then commit if we need to
+            commitIfNeeded(session, message);
+        }
+
+        protected void commitIfNeeded(Session session, Message message) throws Exception {
+            if (session.getTransacted()) {
+                SjmsHelper.commitIfNecessary(session);
+            } else if (message != null && session.getAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE) {
+                message.acknowledge();
+            }
+        }
+
+        protected void rollbackIfNeeded(Session session) throws JMSException {
+            if (session.getTransacted()) {
+                SjmsHelper.rollbackIfNecessary(session);
+            } else if (session.getAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE) {
+                session.recover();
+            }
+        }
+
+    }
+
+    @Override
+    public void onException(JMSException exception) {
+        if (endpoint.getExceptionListener() != null) {
+            try {
+                endpoint.getExceptionListener().onException(exception);
+            } catch (Throwable e) {
+                // ignore
+            }
+        }
+
+        synchronized (this.connectionLock) {
+            this.sessions = null;
+            this.consumers = null;
+        }
+        scheduleConnectionRecovery();
+    }
+
+    protected boolean recoverConnection(BackOffTimer.Task task) throws Exception {
+        LOG.debug("Recovering from JMS Connection exception (attempt: {})", task.getCurrentAttempts());
+        try {
+            refreshConnection();
+            initConsumers();
+            LOG.debug("Successfully recovered JMS Connection (attempt: {})", task.getCurrentAttempts());
+            // success so do not try again
+            return false;
+        } catch (Throwable e) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Failed to recover JMS Connection. Will try again in " + task.getCurrentDelay() + " millis", e);
+            }
+            // try again
+            return true;
+        }
+    }
+
+    protected void scheduleConnectionRecovery() {
+        if (scheduler == null) {
+            this.scheduler = endpoint.getCamelContext().getExecutorServiceManager().newSingleThreadScheduledExecutor(this,
+                    "SimpleMessageListenerContainer");
+        }
+
+        // we need to recover using a background task
+        if (recoverTask == null || recoverTask.getStatus() != BackOffTimer.Task.Status.Active) {
+            BackOff backOff = BackOff.builder().delay(endpoint.getRecoveryInterval()).build();
+            recoverTask = new BackOffTimer(scheduler).schedule(backOff, this::recoverConnection);
+        }
+    }
+
+    @Override
+    protected void doStart() throws Exception {
+        createConnection();
+        initConsumers();
+
+        startConnection();
+    }
+
+    @Override
+    protected void doStop() throws Exception {
+        if (recoverTask != null) {
+            recoverTask.cancel();
+        }
+        stopConnection();
+        stopConsumers();
+        if (scheduler != null) {
+            endpoint.getCamelContext().getExecutorServiceManager().shutdown(scheduler);
+            scheduler = null;
+        }
+    }
+
+    protected void initConsumers() throws Exception {
+        synchronized (this.consumerLock) {
+            if (consumers == null) {
+                sessions = new HashSet<>(concurrentConsumers);
+                consumers = new HashSet<>(concurrentConsumers);
+                for (int i = 0; i < this.concurrentConsumers; i++) {
+                    Session session
+                            = connection.createSession(endpoint.isTransacted(), endpoint.getAcknowledgementMode().intValue());
+                    MessageConsumer consumer = endpoint.getJmsObjectFactory().createMessageConsumer(session, endpoint);
+                    configureConsumer(consumer, session);
+                    sessions.add(session);
+                    consumers.add(consumer);
+                }
+            }
+        }
+    }
+
+    protected void stopConsumers() throws Exception {
+        synchronized (this.consumerLock) {
+            if (consumers != null) {
+                LOG.debug("Stopping JMS MessageConsumers");
+                for (MessageConsumer consumer : this.consumers) {
+                    closeConsumer(consumer);
+                }
+                if (this.sessions != null) {
+                    LOG.debug("Stopping JMS Sessions");
+                    for (Session session : this.sessions) {
+                        closeSession(session);
+                    }
+                }
+            }
+        }
+    }
+
+    protected void createConnection() throws Exception {
+        synchronized (this.connectionLock) {
+            if (this.connection == null) {
+                Connection con = null;
+                try {
+                    con = endpoint.getConnectionFactory().createConnection();
+                    if (endpoint.getComponent().getConnectionClientId() != null) {
+                        con.setClientID(endpoint.getComponent().getConnectionClientId());
+                    }
+                    con.setExceptionListener(this);
+                } catch (JMSException e) {
+                    closeConnection(con);
+                    throw e;
+                }
+                this.connection = con;
+                LOG.debug("Created JMS Connection");
+            }
+        }
+    }
+
+    protected final void refreshConnection() throws Exception {
+        synchronized (this.connectionLock) {
+            closeConnection(connection);
+            this.connection = null;
+            createConnection();
+            if (this.connectionStarted) {
+                startConnection();
+            }
+        }
+    }
+
+    protected void startConnection() throws Exception {
+        synchronized (this.connectionLock) {
+            this.connectionStarted = true;
+            if (this.connection != null) {
+                try {
+                    this.connection.start();
+                } catch (javax.jms.IllegalStateException e) {
+                    // ignore as it may already be started
+                }
+            }
+        }
+    }
+
+    protected void stopConnection() {
+        synchronized (this.connectionLock) {
+            this.connectionStarted = false;
+            if (this.connection != null) {
+                try {
+                    this.connection.stop();
+                } catch (Throwable e) {
+                    LOG.debug("Error stopping connection. This exception is ignored.", e);
+                }
+            }
+        }
+    }
+
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java
index 4e7c4fb..699db13 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java
@@ -111,6 +111,18 @@ public class Jms11ObjectFactory implements JmsObjectFactory {
     }
 
     @Override
+    public MessageProducer createMessageProducer(Session session, Endpoint endpoint, Destination destination) throws Exception {
+        SjmsEndpoint sjmsEndpoint = (SjmsEndpoint) endpoint;
+
+        boolean persistent = sjmsEndpoint.isDeliveryPersistent();
+        if (sjmsEndpoint.getDeliveryMode() != null) {
+            persistent = DeliveryMode.PERSISTENT == sjmsEndpoint.getDeliveryMode();
+        }
+
+        return createMessageProducer(session, destination, persistent, sjmsEndpoint.getTimeToLive());
+    }
+
+    @Override
     public MessageProducer createMessageProducer(
             Session session,
             Destination destination,
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsBinding.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsBinding.java
index 23f2d84..ed88c67 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsBinding.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsBinding.java
@@ -223,7 +223,7 @@ public class JmsBinding {
      * @throws JMSException if the message could not be created
      */
     public Message makeJmsMessage(Exchange exchange, Session session) throws JMSException {
-        Message answer = makeJmsMessage(exchange, exchange.getIn().getBody(), exchange.getIn().getHeaders(), session, null);
+        Message answer = makeJmsMessage(exchange, exchange.getIn(), session, null);
         if (answer != null && messageCreatedStrategy != null) {
             messageCreatedStrategy.onMessageCreated(answer, session, exchange, null);
         }
@@ -234,14 +234,13 @@ public class JmsBinding {
      * Creates a JMS message from the Camel exchange and message
      *
      * @param  exchange     the current exchange
-     * @param  body         the message body
-     * @param  headers      the message headers
+     * @param  camelMessage the body to make a javax.jms.Message as
      * @param  session      the JMS session used to create the message
      * @param  cause        optional exception occurred that should be sent as reply instead of a regular body
      * @return              a newly created JMS Message instance containing the
      * @throws JMSException if the message could not be created
      */
-    public Message makeJmsMessage(Exchange exchange, Object body, Map headers, Session session, Exception cause)
+    public Message makeJmsMessage(Exchange exchange, org.apache.camel.Message camelMessage, Session session, Exception cause)
             throws JMSException {
         Message answer = null;
 
@@ -283,8 +282,9 @@ public class JmsBinding {
                 answer = createJmsMessage(cause, session);
             } else {
                 // create regular jms message using the camel message body
-                answer = createJmsMessage(exchange, body, headers, session, exchange.getContext());
-                appendJmsProperties(answer, exchange, headers);
+                answer = createJmsMessage(exchange, camelMessage.getBody(), camelMessage.getHeaders(), session,
+                        exchange.getContext());
+                appendJmsProperties(answer, exchange, camelMessage.getHeaders());
             }
         }
 
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
index b3494ea..0871be7 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
@@ -400,4 +400,20 @@ public final class JmsMessageHelper {
         return null;
     }
 
+    /**
+     * Gets the JMSDestination from the message.
+     *
+     * @param  message the message
+     * @return         the JMSDestination, or <tt>null</tt> if not able to get
+     */
+    public static Destination getJMSDestination(Message message) {
+        try {
+            return message.getJMSDestination();
+        } catch (Exception e) {
+            // ignore if JMS broker do not support this
+        }
+
+        return null;
+    }
+
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsObjectFactory.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsObjectFactory.java
index ab4b56f..056f676 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsObjectFactory.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsObjectFactory.java
@@ -42,6 +42,8 @@ public interface JmsObjectFactory {
 
     MessageProducer createMessageProducer(Session session, Endpoint endpoint, String destinationName) throws Exception;
 
+    MessageProducer createMessageProducer(Session session, Endpoint endpoint, Destination destination) throws Exception;
+
     MessageProducer createMessageProducer(
             Session session, Destination destination,
             boolean persistent, long ttl)
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
index e1b23d1..b21ce9e 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
@@ -32,6 +32,7 @@ import org.apache.camel.component.sjms.tx.DefaultTransactionCommitStrategy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.component.sjms.SjmsHelper.closeProducer;
 import static org.apache.camel.component.sjms.jms.JmsMessageHelper.isTopicPrefix;
 
 /**
@@ -125,7 +126,7 @@ public class InOnlyProducer extends SjmsProducer {
                     producer = getEndpoint().getJmsObjectFactory().createMessageProducer(sc, getEndpoint(), destinationName);
                     template.send(producer, answer);
                 } finally {
-                    close(producer);
+                    closeProducer(producer);
                 }
                 return null;
             });
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
index 5fadf0d..426ae90 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
@@ -49,11 +49,15 @@ import org.apache.commons.pool.impl.GenericObjectPool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.component.sjms.SjmsHelper.closeProducer;
+
 /**
  * A Camel Producer that provides the InOut Exchange pattern.
  */
 public class InOutProducer extends SjmsProducer {
 
+    // TODO: reply manager
+
     private static final Logger LOG = LoggerFactory.getLogger(InOutProducer.class);
 
     private static final Map<String, Exchanger<Object>> EXCHANGERS = new ConcurrentHashMap<>();
@@ -275,7 +279,7 @@ public class InOutProducer extends SjmsProducer {
                     }
 
                 } finally {
-                    close(producer);
+                    closeProducer(producer);
                 }
                 return null;
             });
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java
index 0b955ca..a888b50 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.sjms;
 
-import java.util.Random;
-
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
@@ -55,17 +53,6 @@ public class SjmsEndpointConnectionSettingsTest extends CamelTestSupport {
         assertEquals(connectionResource, qe.getConnectionResource());
     }
 
-    @Test
-    public void testConnectionCount() {
-        Random random = new Random();
-        int poolSize = random.nextInt(100);
-        Endpoint endpoint = context.getEndpoint("sjms:queue:test?connectionCount=" + poolSize);
-        assertNotNull(endpoint);
-        assertTrue(endpoint instanceof SjmsEndpoint);
-        SjmsEndpoint qe = (SjmsEndpoint) endpoint;
-        assertEquals(poolSize, qe.getConnectionCount());
-    }
-
     @Override
     protected CamelContext createCamelContext() throws Exception {
         SimpleRegistry registry = new SimpleRegistry();
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
index a585e0c..0192df4 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
@@ -65,17 +65,17 @@ public class AsyncConsumerInOutTest extends CamelTestSupport {
             @Override
             public void configure() throws Exception {
                 // enable async in only mode on the consumer
-                from("sjms:queue:start?synchronous=false")
+                from("sjms:queue:start?asyncConsumer=true")
                         .choice()
                         .when(body().contains("Camel"))
                         .to("async:camel?delay=2000")
-                        .to(ExchangePattern.InOut, "sjms:queue:in.out.test?replyTo=response.queue&synchronous=false")
+                        .to(ExchangePattern.InOut, "sjms:queue:in.out.test?replyTo=response.queue")
                         .to("mock:result")
                         .otherwise()
                         .to("log:other")
                         .to("mock:result");
 
-                from("sjms:queue:in.out.test?exchangePattern=InOut&synchronous=false")
+                from("sjms:queue:in.out.test?asyncConsumer=true")
                         .to("log:camel")
                         .transform(constant("Bye Camel"));
             }
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncTrueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncTrueTest.java
index 83a4081..7d9259f 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncTrueTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncTrueTest.java
@@ -45,7 +45,7 @@ public class InOnlyConsumerAsyncTrueTest extends JmsTestSupport {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("sjms:queue:in.only.consumer.async?synchronous=false").to("log:before")
+                from("sjms:queue:in.only.consumer.async?asyncConsumer=true").to("log:before")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws Exception {
                                 if (exchange.getIn().getBody(String.class).equals("Hello Camel")) {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueSynchronousTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueSynchronousTest.java
index f7f523c..75649e3 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueSynchronousTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueSynchronousTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 
 public class InOnlyConsumerQueueSynchronousTest extends JmsTestSupport {
 
-    private static final String SJMS_QUEUE_NAME = "sjms:queue:in.only.consumer.queue?synchronous=true";
+    private static final String SJMS_QUEUE_NAME = "sjms:queue:in.only.consumer.queue";
     private static final String MOCK_RESULT = "mock:result";
 
     @Test
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java
index 9d962ab..0b89f96 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java
@@ -38,11 +38,11 @@ public class InOutConsumerQueueAsyncTest extends JmsTestSupport {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("sjms:queue:start?synchronous=false")
-                        .to("sjms:queue:in.out.queue?exchangePattern=InOut&synchronous=false&replyTo=in.out.queue.response")
+                from("sjms:queue:start?asyncConsumer=true")
+                        .to("sjms:queue:in.out.queue?replyTo=in.out.queue.response")
                         .to("mock:result");
 
-                from("sjms:queue:in.out.queue?exchangePattern=InOut&synchronous=false").to("log:before")
+                from("sjms:queue:in.out.queue?asyncConsumer=true").to("log:before")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws Exception {
                                 String body = (String) exchange.getIn().getBody();
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java
index c60236c..a6c8478 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java
@@ -28,8 +28,8 @@ public class InOutConsumerTempQueueAsyncTest extends JmsTestSupport {
     public void testAynchronous() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Hello World", "Hello Camel");
 
-        template.sendBody("sjms:start", "Hello Camel");
-        template.sendBody("sjms:start", "Hello World");
+        template.requestBody("sjms:start", "Hello Camel");
+        template.requestBody("sjms:start", "Hello World");
         Thread.sleep(5000);
         assertMockEndpointsSatisfied();
     }
@@ -38,11 +38,11 @@ public class InOutConsumerTempQueueAsyncTest extends JmsTestSupport {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("sjms:queue:start?synchronous=false")
-                        .to("sjms:queue:in.out.temp.queue?exchangePattern=InOut&synchronous=false")
+                from("sjms:queue:start?asyncConsumer=true")
+                        .to("sjms:queue:in.out.temp.queue")
                         .to("mock:result");
 
-                from("sjms:queue:in.out.temp.queue?exchangePattern=InOut&synchronous=false").to("log:before")
+                from("sjms:queue:in.out.temp.queue?asyncConsumer=true").to("log:before")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws Exception {
                                 String body = (String) exchange.getIn().getBody();
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
index 9a6658c..2288380 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
@@ -57,10 +57,10 @@ public class AsyncJmsInOutIT extends JmsTestSupport {
             public void configure() throws Exception {
 
                 from("seda:start")
-                        .to("sjms:queue:in.foo?synchronous=false&replyTo=out.bar&exchangePattern=InOut")
+                        .to("sjms:queue:in.foo?asyncConsumer=true&replyTo=out.bar&exchangePattern=InOut")
                         .to("mock:result");
 
-                from("sjms:queue:in.foo?synchronous=false&exchangePattern=InOut")
+                from("sjms:queue:in.foo?asyncConsumer=true")
                         .log("Using ${threadName} to process ${body}")
                         .transform(body().prepend("Bye "));
             }
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java
index 580eefb..0e37e78 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java
@@ -57,10 +57,10 @@ public class AsyncJmsInOutTempDestIT extends JmsTestSupport {
             public void configure() throws Exception {
 
                 from("seda:start")
-                        .to("sjms:in.foo.tempQ?synchronous=false&exchangePattern=InOut")
+                        .to("sjms:in.foo.tempQ?exchangePattern=InOut")
                         .to("mock:result");
 
-                from("sjms:in.foo.tempQ?synchronous=false&exchangePattern=InOut")
+                from("sjms:in.foo.tempQ?asyncConsumer=true")
                         .log("Using ${threadName} to process ${body}")
                         .transform(body().prepend("Bye "));
             }
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java
index 5d72413..ab3a132 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java
@@ -89,9 +89,9 @@ public class AsyncQueueProducerTest extends CamelTestSupport {
                                 afterThreadName = Thread.currentThread().getName();
                             }
                         })
-                        .to("sjms:queue:foo?synchronous=false");
+                        .to("sjms:queue:foo");
 
-                from("sjms:queue:foo?synchronous=false")
+                from("sjms:queue:foo?asyncConsumer=true")
                         .to("mock:after")
                         .to("log:after")
                         .delay(1000)
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncTopicProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncTopicProducerTest.java
index 19f3d24..bf04b87 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncTopicProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncTopicProducerTest.java
@@ -89,7 +89,7 @@ public class AsyncTopicProducerTest extends CamelTestSupport {
                                 afterThreadName = Thread.currentThread().getName();
                             }
                         })
-                        .to("sjms:topic:foo?synchronous=false");
+                        .to("sjms:topic:foo");
 
                 from("sjms:topic:foo")
                         .to("mock:after")
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
index aaa2a31..4a618d0 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
@@ -119,7 +119,7 @@ public class InOutQueueProducerAsyncLoadTest extends JmsTestSupport {
                         .to("log:" + TEST_DESTINATION_NAME + ".in.log?showBody=true")
                         .to(ExchangePattern.InOut, "sjms:queue:" + TEST_DESTINATION_NAME + ".request" + "?replyTo="
                                                    + TEST_DESTINATION_NAME
-                                                   + ".response&consumerCount=10&synchronous=false")
+                                                   + ".response&consumerCount=10")
                         .threads(20)
                         .to("log:" + TEST_DESTINATION_NAME + ".out.log?showBody=true");
             }
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
index 445cc01..d575040 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
@@ -94,7 +94,7 @@ public class InOutQueueProducerSyncLoadTest extends JmsTestSupport {
                         assertNotNull(response);
                         assertEquals(responseText, response);
                     } catch (Exception e) {
-                        log.error("TODO Auto-generated catch block", e);
+                        log.warn("Error", e);
                     }
                 }
             };
@@ -117,7 +117,7 @@ public class InOutQueueProducerSyncLoadTest extends JmsTestSupport {
                         .to("log:" + TEST_DESTINATION_NAME + ".in.log?showBody=true")
                         .to(ExchangePattern.InOut, "sjms:queue:" + TEST_DESTINATION_NAME + ".request" + "?replyTo="
                                                    + TEST_DESTINATION_NAME
-                                                   + ".response&consumerCount=20&synchronous=true")
+                                                   + ".response&consumerCount=20")
                         .to("log:" + TEST_DESTINATION_NAME + ".out.log?showBody=true");
             }
         };
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/NoConnectionFactoryTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/NoConnectionFactoryTest.java
deleted file mode 100644
index a784b8f..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/NoConnectionFactoryTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.producer;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.FailedToStartRouteException;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
-/**
- * A unit test to ensure getting a meaningful error message when neither of ConnectionResource nor ConnectionFactory is
- * configured.
- */
-public class NoConnectionFactoryTest {
-
-    private static final Logger LOG = LoggerFactory.getLogger(NoConnectionFactoryTest.class);
-
-    @Test
-    public void testConsumerInOnly() throws Exception {
-        CamelContext context = new DefaultCamelContext();
-        context.addRoutes(createConsumerInOnlyRouteBuilder());
-        try {
-            context.start();
-        } catch (Throwable t) {
-            assertEquals(IllegalArgumentException.class, t.getClass());
-            LOG.info("Expected exception was thrown", t);
-            return;
-        }
-        fail("No exception was thrown");
-    }
-
-    @Test
-    public void testConsumerInOut() throws Exception {
-        CamelContext context = new DefaultCamelContext();
-        context.addRoutes(createConsumerInOutRouteBuilder());
-        try {
-            context.start();
-        } catch (Throwable t) {
-            assertEquals(IllegalArgumentException.class, t.getClass());
-            LOG.info("Expected exception was thrown", t);
-            return;
-        }
-        fail("No exception was thrown");
-    }
-
-    @Test
-    public void testProducerInOnly() throws Exception {
-        CamelContext context = new DefaultCamelContext();
-        context.addRoutes(createProducerInOnlyRouteBuilder());
-        try {
-            context.start();
-        } catch (Throwable t) {
-            assertEquals(FailedToStartRouteException.class, t.getClass());
-            assertEquals(IllegalArgumentException.class, t.getCause().getCause().getClass());
-            LOG.info("Expected exception was thrown", t);
-            return;
-        }
-        fail("No exception was thrown");
-    }
-
-    @Test
-    public void testProducerInOut() throws Exception {
-        CamelContext context = new DefaultCamelContext();
-        context.addRoutes(createProducerInOutRouteBuilder());
-        try {
-            context.start();
-        } catch (Throwable t) {
-            assertEquals(FailedToStartRouteException.class, t.getClass());
-            assertEquals(IllegalArgumentException.class, t.getCause().getCause().getClass());
-            LOG.info("Expected exception was thrown", t);
-            return;
-        }
-        fail("No exception was thrown");
-    }
-
-    protected RouteBuilder createConsumerInOnlyRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("sjms:queue:test-in?exchangePattern=InOnly")
-                        .to("mock:result");
-            }
-        };
-    }
-
-    protected RouteBuilder createConsumerInOutRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("sjms:queue:test-in?exchangePattern=InOut")
-                        .to("mock:result");
-            }
-        };
-    }
-
-    protected RouteBuilder createProducerInOnlyRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("direct:inonly")
-                        .to("sjms:queue:test-out?exchangePattern=InOnly")
-                        .to("mock:result");
-            }
-        };
-    }
-
-    protected RouteBuilder createProducerInOutRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("direct:inout")
-                        .to("sjms:queue:test-out?exchangePattern=InOut")
-                        .to("mock:result");
-            }
-        };
-    }
-}
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java
index a20f612..730c6ba 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java
@@ -107,36 +107,6 @@ public interface SjmsComponentBuilderFactory {
             return this;
         }
         /**
-         * Backoff in millis on consumer pool reconnection attempts.
-         * 
-         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
-         * 
-         * Default: 5000
-         * Group: consumer
-         * 
-         * @param reconnectBackOff the value to set
-         * @return the dsl builder
-         */
-        default SjmsComponentBuilder reconnectBackOff(long reconnectBackOff) {
-            doSetProperty("reconnectBackOff", reconnectBackOff);
-            return this;
-        }
-        /**
-         * Try to apply reconnection logic on consumer pool.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: consumer
-         * 
-         * @param reconnectOnError the value to set
-         * @return the dsl builder
-         */
-        default SjmsComponentBuilder reconnectOnError(boolean reconnectOnError) {
-            doSetProperty("reconnectOnError", reconnectOnError);
-            return this;
-        }
-        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -307,6 +277,23 @@ public interface SjmsComponentBuilderFactory {
             return this;
         }
         /**
+         * Specifies the interval between recovery attempts, i.e. when a
+         * connection is being refreshed, in milliseconds. The default is 5000
+         * ms, that is, 5 seconds.
+         * 
+         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 5000
+         * Group: advanced
+         * 
+         * @param recoveryInterval the value to set
+         * @return the dsl builder
+         */
+        default SjmsComponentBuilder recoveryInterval(long recoveryInterval) {
+            doSetProperty("recoveryInterval", recoveryInterval);
+            return this;
+        }
+        /**
          * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
          * header to and from Camel message.
          * 
@@ -395,8 +382,6 @@ public interface SjmsComponentBuilderFactory {
             case "connectionCount": ((SjmsComponent) component).setConnectionCount((java.lang.Integer) value); return true;
             case "connectionFactory": ((SjmsComponent) component).setConnectionFactory((javax.jms.ConnectionFactory) value); return true;
             case "bridgeErrorHandler": ((SjmsComponent) component).setBridgeErrorHandler((boolean) value); return true;
-            case "reconnectBackOff": ((SjmsComponent) component).setReconnectBackOff((long) value); return true;
-            case "reconnectOnError": ((SjmsComponent) component).setReconnectOnError((boolean) value); return true;
             case "lazyStartProducer": ((SjmsComponent) component).setLazyStartProducer((boolean) value); return true;
             case "autowiredEnabled": ((SjmsComponent) component).setAutowiredEnabled((boolean) value); return true;
             case "connectionClientId": ((SjmsComponent) component).setConnectionClientId((java.lang.String) value); return true;
@@ -406,6 +391,7 @@ public interface SjmsComponentBuilderFactory {
             case "destinationCreationStrategy": ((SjmsComponent) component).setDestinationCreationStrategy((org.apache.camel.component.sjms.jms.DestinationCreationStrategy) value); return true;
             case "jmsKeyFormatStrategy": ((SjmsComponent) component).setJmsKeyFormatStrategy((org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy) value); return true;
             case "messageCreatedStrategy": ((SjmsComponent) component).setMessageCreatedStrategy((org.apache.camel.component.sjms.jms.MessageCreatedStrategy) value); return true;
+            case "recoveryInterval": ((SjmsComponent) component).setRecoveryInterval((long) value); return true;
             case "headerFilterStrategy": ((SjmsComponent) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
             case "connectionPassword": ((SjmsComponent) component).setConnectionPassword((java.lang.String) value); return true;
             case "connectionUsername": ((SjmsComponent) component).setConnectionUsername((java.lang.String) value); return true;
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java
index 13587e2..31743a6 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java
@@ -142,212 +142,234 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Allows for bridging the consumer to the Camel routing Error Handler,
-         * which mean any exceptions occurred while the consumer is trying to
-         * pickup incoming messages, or the likes, will now be processed as a
-         * message and handled by the routing Error Handler. By default the
-         * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
-         * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored.
+         * Specifies whether to test the connection on startup. This ensures
+         * that when Camel starts that all the JMS consumers have a valid
+         * connection to the JMS broker. If a connection cannot be granted then
+         * Camel throws an exception on startup. This ensures that Camel is not
+         * started with failed connections. The JMS producers is tested as well.
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
          * Default: false
-         * Group: consumer
+         * Group: common
          * 
-         * @param bridgeErrorHandler the value to set
+         * @param testConnectionOnStartup the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointConsumerBuilder bridgeErrorHandler(
-                boolean bridgeErrorHandler) {
-            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
+        default SjmsEndpointConsumerBuilder testConnectionOnStartup(
+                boolean testConnectionOnStartup) {
+            doSetProperty("testConnectionOnStartup", testConnectionOnStartup);
             return this;
         }
         /**
-         * Allows for bridging the consumer to the Camel routing Error Handler,
-         * which mean any exceptions occurred while the consumer is trying to
-         * pickup incoming messages, or the likes, will now be processed as a
-         * message and handled by the routing Error Handler. By default the
-         * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
-         * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored.
+         * Specifies whether to test the connection on startup. This ensures
+         * that when Camel starts that all the JMS consumers have a valid
+         * connection to the JMS broker. If a connection cannot be granted then
+         * Camel throws an exception on startup. This ensures that Camel is not
+         * started with failed connections. The JMS producers is tested as well.
          * 
          * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
          * type.
          * 
          * Default: false
-         * Group: consumer
+         * Group: common
          * 
-         * @param bridgeErrorHandler the value to set
+         * @param testConnectionOnStartup the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointConsumerBuilder bridgeErrorHandler(
-                String bridgeErrorHandler) {
-            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
+        default SjmsEndpointConsumerBuilder testConnectionOnStartup(
+                String testConnectionOnStartup) {
+            doSetProperty("testConnectionOnStartup", testConnectionOnStartup);
             return this;
         }
         /**
-         * Sets the number of consumer listeners used for this endpoint.
+         * Whether the JmsConsumer processes the Exchange asynchronously. If
+         * enabled then the JmsConsumer may pickup the next message from the JMS
+         * queue, while the previous message is being processed asynchronously
+         * (by the Asynchronous Routing Engine). This means that messages may be
+         * processed not 100% strictly in order. If disabled (as default) then
+         * the Exchange is fully processed before the JmsConsumer will pickup
+         * the next message from the JMS queue. Note if transacted has been
+         * enabled, then asyncConsumer=true does not run asynchronously, as
+         * transaction must be executed synchronously (Camel 3.0 may support
+         * async transactions).
          * 
-         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: 1
+         * Default: false
          * Group: consumer
          * 
-         * @param consumerCount the value to set
+         * @param asyncConsumer the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointConsumerBuilder consumerCount(int consumerCount) {
-            doSetProperty("consumerCount", consumerCount);
+        default SjmsEndpointConsumerBuilder asyncConsumer(boolean asyncConsumer) {
+            doSetProperty("asyncConsumer", asyncConsumer);
             return this;
         }
         /**
-         * Sets the number of consumer listeners used for this endpoint.
+         * Whether the JmsConsumer processes the Exchange asynchronously. If
+         * enabled then the JmsConsumer may pickup the next message from the JMS
+         * queue, while the previous message is being processed asynchronously
+         * (by the Asynchronous Routing Engine). This means that messages may be
+         * processed not 100% strictly in order. If disabled (as default) then
+         * the Exchange is fully processed before the JmsConsumer will pickup
+         * the next message from the JMS queue. Note if transacted has been
+         * enabled, then asyncConsumer=true does not run asynchronously, as
+         * transaction must be executed synchronously (Camel 3.0 may support
+         * async transactions).
          * 
-         * The option will be converted to a &lt;code&gt;int&lt;/code&gt; type.
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
          * 
-         * Default: 1
+         * Default: false
          * Group: consumer
          * 
-         * @param consumerCount the value to set
+         * @param asyncConsumer the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointConsumerBuilder consumerCount(String consumerCount) {
-            doSetProperty("consumerCount", consumerCount);
+        default SjmsEndpointConsumerBuilder asyncConsumer(String asyncConsumer) {
+            doSetProperty("asyncConsumer", asyncConsumer);
             return this;
         }
         /**
-         * Sets the durable subscription Id required for durable topics.
+         * Specifies whether the consumer container should auto-startup.
          * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
+         * Default: true
          * Group: consumer
          * 
-         * @param durableSubscriptionId the value to set
+         * @param autoStartup the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointConsumerBuilder durableSubscriptionId(
-                String durableSubscriptionId) {
-            doSetProperty("durableSubscriptionId", durableSubscriptionId);
+        default SjmsEndpointConsumerBuilder autoStartup(boolean autoStartup) {
+            doSetProperty("autoStartup", autoStartup);
             return this;
         }
         /**
-         * Backoff in millis on consumer pool reconnection attempts.
+         * Specifies whether the consumer container should auto-startup.
          * 
-         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
          * 
-         * Default: 5000
+         * Default: true
          * Group: consumer
          * 
-         * @param reconnectBackOff the value to set
+         * @param autoStartup the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointConsumerBuilder reconnectBackOff(
-                long reconnectBackOff) {
-            doSetProperty("reconnectBackOff", reconnectBackOff);
+        default SjmsEndpointConsumerBuilder autoStartup(String autoStartup) {
+            doSetProperty("autoStartup", autoStartup);
             return this;
         }
         /**
-         * Backoff in millis on consumer pool reconnection attempts.
+         * Allows for bridging the consumer to the Camel routing Error Handler,
+         * which mean any exceptions occurred while the consumer is trying to
+         * pickup incoming messages, or the likes, will now be processed as a
+         * message and handled by the routing Error Handler. By default the
+         * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
+         * with exceptions, that will be logged at WARN or ERROR level and
+         * ignored.
          * 
-         * The option will be converted to a &lt;code&gt;long&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: 5000
+         * Default: false
          * Group: consumer
          * 
-         * @param reconnectBackOff the value to set
+         * @param bridgeErrorHandler the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointConsumerBuilder reconnectBackOff(
-                String reconnectBackOff) {
-            doSetProperty("reconnectBackOff", reconnectBackOff);
+        default SjmsEndpointConsumerBuilder bridgeErrorHandler(
+                boolean bridgeErrorHandler) {
+            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
             return this;
         }
         /**
-         * Try to apply reconnection logic on consumer pool.
+         * Allows for bridging the consumer to the Camel routing Error Handler,
+         * which mean any exceptions occurred while the consumer is trying to
+         * pickup incoming messages, or the likes, will now be processed as a
+         * message and handled by the routing Error Handler. By default the
+         * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
+         * with exceptions, that will be logged at WARN or ERROR level and
+         * ignored.
          * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
          * 
-         * Default: true
+         * Default: false
          * Group: consumer
          * 
-         * @param reconnectOnError the value to set
+         * @param bridgeErrorHandler the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointConsumerBuilder reconnectOnError(
-                boolean reconnectOnError) {
-            doSetProperty("reconnectOnError", reconnectOnError);
+        default SjmsEndpointConsumerBuilder bridgeErrorHandler(
+                String bridgeErrorHandler) {
+            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
             return this;
         }
         /**
-         * Try to apply reconnection logic on consumer pool.
+         * Sets the number of consumer listeners used for this endpoint.
          * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: 1
          * Group: consumer
          * 
-         * @param reconnectOnError the value to set
+         * @param consumerCount the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointConsumerBuilder reconnectOnError(
-                String reconnectOnError) {
-            doSetProperty("reconnectOnError", reconnectOnError);
+        default SjmsEndpointConsumerBuilder consumerCount(int consumerCount) {
+            doSetProperty("consumerCount", consumerCount);
             return this;
         }
         /**
-         * Specifies whether to use persistent delivery by default for replies.
+         * Sets the number of consumer listeners used for this endpoint.
          * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * The option will be converted to a &lt;code&gt;int&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: 1
          * Group: consumer
          * 
-         * @param replyToDeliveryPersistent the value to set
+         * @param consumerCount the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointConsumerBuilder replyToDeliveryPersistent(
-                boolean replyToDeliveryPersistent) {
-            doSetProperty("replyToDeliveryPersistent", replyToDeliveryPersistent);
+        default SjmsEndpointConsumerBuilder consumerCount(String consumerCount) {
+            doSetProperty("consumerCount", consumerCount);
             return this;
         }
         /**
-         * Specifies whether to use persistent delivery by default for replies.
+         * Sets the durable subscription Id required for durable topics.
          * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
-         * Default: true
          * Group: consumer
          * 
-         * @param replyToDeliveryPersistent the value to set
+         * @param durableSubscriptionId the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointConsumerBuilder replyToDeliveryPersistent(
-                String replyToDeliveryPersistent) {
-            doSetProperty("replyToDeliveryPersistent", replyToDeliveryPersistent);
+        default SjmsEndpointConsumerBuilder durableSubscriptionId(
+                String durableSubscriptionId) {
+            doSetProperty("durableSubscriptionId", durableSubscriptionId);
             return this;
         }
         /**
-         * Sets whether synchronous processing should be strictly used or Camel
-         * is allowed to use asynchronous processing (if supported).
+         * Specifies whether to use persistent delivery by default for replies.
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
          * Default: true
          * Group: consumer
          * 
-         * @param synchronous the value to set
+         * @param replyToDeliveryPersistent the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointConsumerBuilder synchronous(boolean synchronous) {
-            doSetProperty("synchronous", synchronous);
+        default SjmsEndpointConsumerBuilder replyToDeliveryPersistent(
+                boolean replyToDeliveryPersistent) {
+            doSetProperty("replyToDeliveryPersistent", replyToDeliveryPersistent);
             return this;
         }
         /**
-         * Sets whether synchronous processing should be strictly used or Camel
-         * is allowed to use asynchronous processing (if supported).
+         * Specifies whether to use persistent delivery by default for replies.
          * 
          * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
          * type.
@@ -355,11 +377,12 @@ public interface SjmsEndpointBuilderFactory {
          * Default: true
          * Group: consumer
          * 
-         * @param synchronous the value to set
+         * @param replyToDeliveryPersistent the value to set
          * @return the dsl builder
          */
-        default SjmsEndpointConsumerBuilder synchronous(String synchronous) {
-            doSetProperty("synchronous", synchronous);
+        default SjmsEndpointConsumerBuilder replyToDeliveryPersistent(
+                String replyToDeliveryPersistent) {
+            doSetProperty("replyToDeliveryPersistent", replyToDeliveryPersistent);
             return this;
         }
         /**
@@ -508,6 +531,68 @@ public interface SjmsEndpointBuilderFactory {
             return (SjmsEndpointConsumerBuilder) this;
         }
         /**
+         * Enables eager loading of JMS properties and payload as soon as a
+         * message is loaded which generally is inefficient as the JMS
+         * properties may not be required but sometimes can catch early any
+         * issues with the underlying JMS provider and the use of JMS
+         * properties. See also the option eagerPoisonBody.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: consumer (advanced)
+         * 
+         * @param eagerLoadingOfProperties the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointConsumerBuilder eagerLoadingOfProperties(
+                boolean eagerLoadingOfProperties) {
+            doSetProperty("eagerLoadingOfProperties", eagerLoadingOfProperties);
+            return this;
+        }
+        /**
+         * Enables eager loading of JMS properties and payload as soon as a
+         * message is loaded which generally is inefficient as the JMS
+         * properties may not be required but sometimes can catch early any
+         * issues with the underlying JMS provider and the use of JMS
+         * properties. See also the option eagerPoisonBody.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: consumer (advanced)
+         * 
+         * @param eagerLoadingOfProperties the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointConsumerBuilder eagerLoadingOfProperties(
+                String eagerLoadingOfProperties) {
+            doSetProperty("eagerLoadingOfProperties", eagerLoadingOfProperties);
+            return this;
+        }
+        /**
+         * If eagerLoadingOfProperties is enabled and the JMS message payload
+         * (JMS body or JMS properties) is poison (cannot be read/mapped), then
+         * set this text as the message body instead so the message can be
+         * processed (the cause of the poison are already stored as exception on
+         * the Exchange). This can be turned off by setting
+         * eagerPoisonBody=false. See also the option eagerLoadingOfProperties.
+         * 
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
+         * 
+         * Default: Poison JMS message due to ${exception.message}
+         * Group: consumer (advanced)
+         * 
+         * @param eagerPoisonBody the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointConsumerBuilder eagerPoisonBody(
+                String eagerPoisonBody) {
+            doSetProperty("eagerPoisonBody", eagerPoisonBody);
+            return this;
+        }
+        /**
          * To let the consumer use a custom ExceptionHandler. Notice if the
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
@@ -593,6 +678,45 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
+         * 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.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: consumer (advanced)
+         * 
+         * @param replyToSameDestinationAllowed the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointConsumerBuilder replyToSameDestinationAllowed(
+                boolean replyToSameDestinationAllowed) {
+            doSetProperty("replyToSameDestinationAllowed", replyToSameDestinationAllowed);
+            return this;
+        }
+        /**
+         * 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.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: consumer (advanced)
+         * 
+         * @param replyToSameDestinationAllowed the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointConsumerBuilder replyToSameDestinationAllowed(
+                String replyToSameDestinationAllowed) {
+            doSetProperty("replyToSameDestinationAllowed", replyToSameDestinationAllowed);
+            return this;
+        }
+        /**
          * Whether to startup the consumer message listener asynchronously, when
          * starting a route. For example if a JmsConsumer cannot get a
          * connection to a remote JMS broker, then it may block while retrying
@@ -1042,6 +1166,136 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies the interval between recovery attempts, i.e. when a
+         * connection is being refreshed, in milliseconds. The default is 5000
+         * ms, that is, 5 seconds.
+         * 
+         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 5000
+         * Group: advanced
+         * 
+         * @param recoveryInterval the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointConsumerBuilder recoveryInterval(
+                long recoveryInterval) {
+            doSetProperty("recoveryInterval", recoveryInterval);
+            return this;
+        }
+        /**
+         * Specifies the interval between recovery attempts, i.e. when a
+         * connection is being refreshed, in milliseconds. The default is 5000
+         * ms, that is, 5 seconds.
+         * 
+         * The option will be converted to a &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 5000
+         * Group: advanced
+         * 
+         * @param recoveryInterval the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointConsumerBuilder recoveryInterval(
+                String recoveryInterval) {
+            doSetProperty("recoveryInterval", recoveryInterval);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param synchronous the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointConsumerBuilder synchronous(
+                boolean synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param synchronous the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointConsumerBuilder synchronous(
+                String synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
+        /**
+         * If enabled and you are using Request Reply messaging (InOut) and an
+         * Exchange failed on the consumer side, then the caused Exception will
+         * be send back in response as a javax.jms.ObjectMessage. If the client
+         * is Camel, the returned Exception is rethrown. This allows you to use
+         * Camel JMS as a bridge in your routing - for example, using persistent
+         * queues to enable robust routing. Notice that if you also have
+         * transferExchange enabled, this option takes precedence. The caught
+         * exception is required to be serializable. The original Exception on
+         * the consumer side can be wrapped in an outer exception such as
+         * org.apache.camel.RuntimeCamelException when returned to the producer.
+         * Use this with caution as the data is using Java Object serialization
+         * and requires the received to be able to deserialize the data at Class
+         * level, which forces a strong coupling between the producers and
+         * consumer!.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param transferException the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointConsumerBuilder transferException(
+                boolean transferException) {
+            doSetProperty("transferException", transferException);
+            return this;
+        }
+        /**
+         * If enabled and you are using Request Reply messaging (InOut) and an
+         * Exchange failed on the consumer side, then the caused Exception will
+         * be send back in response as a javax.jms.ObjectMessage. If the client
+         * is Camel, the returned Exception is rethrown. This allows you to use
+         * Camel JMS as a bridge in your routing - for example, using persistent
+         * queues to enable robust routing. Notice that if you also have
+         * transferExchange enabled, this option takes precedence. The caught
+         * exception is required to be serializable. The original Exception on
+         * the consumer side can be wrapped in an outer exception such as
+         * org.apache.camel.RuntimeCamelException when returned to the producer.
+         * Use this with caution as the data is using Java Object serialization
+         * and requires the received to be able to deserialize the data at Class
+         * level, which forces a strong coupling between the producers and
+         * consumer!.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param transferException the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointConsumerBuilder transferException(
+                String transferException) {
+            doSetProperty("transferException", transferException);
+            return this;
+        }
+        /**
          * Specifies whether to share JMS session with other SJMS endpoints.
          * Turn this off if your route is accessing to multiple JMS providers.
          * If you need transaction against multiple JMS providers, use jms
@@ -1189,6 +1443,47 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies whether to test the connection on startup. This ensures
+         * that when Camel starts that all the JMS consumers have a valid
+         * connection to the JMS broker. If a connection cannot be granted then
+         * Camel throws an exception on startup. This ensures that Camel is not
+         * started with failed connections. The JMS producers is tested as well.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param testConnectionOnStartup the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointProducerBuilder testConnectionOnStartup(
+                boolean testConnectionOnStartup) {
+            doSetProperty("testConnectionOnStartup", testConnectionOnStartup);
+            return this;
+        }
+        /**
+         * Specifies whether to test the connection on startup. This ensures
+         * that when Camel starts that all the JMS consumers have a valid
+         * connection to the JMS broker. If a connection cannot be granted then
+         * Camel throws an exception on startup. This ensures that Camel is not
+         * started with failed connections. The JMS producers is tested as well.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param testConnectionOnStartup the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointProducerBuilder testConnectionOnStartup(
+                String testConnectionOnStartup) {
+            doSetProperty("testConnectionOnStartup", testConnectionOnStartup);
+            return this;
+        }
+        /**
          * Specifies the delivery mode to be used. Possible values are those
          * defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT
          * = 2.
@@ -1629,6 +1924,55 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
+         * Use this option to force disabling time to live. For example when you
+         * do request/reply over JMS, then Camel will by default use the
+         * requestTimeout value as time to live on the message being sent. The
+         * problem is that the sender and receiver systems have to have their
+         * clocks synchronized, so they are in sync. This is not always so easy
+         * to archive. So you can use disableTimeToLive=true to not set a time
+         * to live value on the sent message. Then the message will not expire
+         * on the receiver system. See below in section About time to live for
+         * more details.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: producer (advanced)
+         * 
+         * @param disableTimeToLive the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointProducerBuilder disableTimeToLive(
+                boolean disableTimeToLive) {
+            doSetProperty("disableTimeToLive", disableTimeToLive);
+            return this;
+        }
+        /**
+         * Use this option to force disabling time to live. For example when you
+         * do request/reply over JMS, then Camel will by default use the
+         * requestTimeout value as time to live on the message being sent. The
+         * problem is that the sender and receiver systems have to have their
+         * clocks synchronized, so they are in sync. This is not always so easy
+         * to archive. So you can use disableTimeToLive=true to not set a time
+         * to live value on the sent message. Then the message will not expire
+         * on the receiver system. See below in section About time to live for
+         * more details.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: producer (advanced)
+         * 
+         * @param disableTimeToLive the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointProducerBuilder disableTimeToLive(
+                String disableTimeToLive) {
+            doSetProperty("disableTimeToLive", disableTimeToLive);
+            return this;
+        }
+        /**
          * Whether to startup the consumer message listener asynchronously, when
          * starting a route. For example if a JmsConsumer cannot get a
          * connection to a remote JMS broker, then it may block while retrying
@@ -2078,6 +2422,136 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies the interval between recovery attempts, i.e. when a
+         * connection is being refreshed, in milliseconds. The default is 5000
+         * ms, that is, 5 seconds.
+         * 
+         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 5000
+         * Group: advanced
+         * 
+         * @param recoveryInterval the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointProducerBuilder recoveryInterval(
+                long recoveryInterval) {
+            doSetProperty("recoveryInterval", recoveryInterval);
+            return this;
+        }
+        /**
+         * Specifies the interval between recovery attempts, i.e. when a
+         * connection is being refreshed, in milliseconds. The default is 5000
+         * ms, that is, 5 seconds.
+         * 
+         * The option will be converted to a &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 5000
+         * Group: advanced
+         * 
+         * @param recoveryInterval the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointProducerBuilder recoveryInterval(
+                String recoveryInterval) {
+            doSetProperty("recoveryInterval", recoveryInterval);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param synchronous the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointProducerBuilder synchronous(
+                boolean synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param synchronous the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointProducerBuilder synchronous(
+                String synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
+        /**
+         * If enabled and you are using Request Reply messaging (InOut) and an
+         * Exchange failed on the consumer side, then the caused Exception will
+         * be send back in response as a javax.jms.ObjectMessage. If the client
+         * is Camel, the returned Exception is rethrown. This allows you to use
+         * Camel JMS as a bridge in your routing - for example, using persistent
+         * queues to enable robust routing. Notice that if you also have
+         * transferExchange enabled, this option takes precedence. The caught
+         * exception is required to be serializable. The original Exception on
+         * the consumer side can be wrapped in an outer exception such as
+         * org.apache.camel.RuntimeCamelException when returned to the producer.
+         * Use this with caution as the data is using Java Object serialization
+         * and requires the received to be able to deserialize the data at Class
+         * level, which forces a strong coupling between the producers and
+         * consumer!.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param transferException the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointProducerBuilder transferException(
+                boolean transferException) {
+            doSetProperty("transferException", transferException);
+            return this;
+        }
+        /**
+         * If enabled and you are using Request Reply messaging (InOut) and an
+         * Exchange failed on the consumer side, then the caused Exception will
+         * be send back in response as a javax.jms.ObjectMessage. If the client
+         * is Camel, the returned Exception is rethrown. This allows you to use
+         * Camel JMS as a bridge in your routing - for example, using persistent
+         * queues to enable robust routing. Notice that if you also have
+         * transferExchange enabled, this option takes precedence. The caught
+         * exception is required to be serializable. The original Exception on
+         * the consumer side can be wrapped in an outer exception such as
+         * org.apache.camel.RuntimeCamelException when returned to the producer.
+         * Use this with caution as the data is using Java Object serialization
+         * and requires the received to be able to deserialize the data at Class
+         * level, which forces a strong coupling between the producers and
+         * consumer!.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param transferException the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointProducerBuilder transferException(
+                String transferException) {
+            doSetProperty("transferException", transferException);
+            return this;
+        }
+        /**
          * Specifies whether to share JMS session with other SJMS endpoints.
          * Turn this off if your route is accessing to multiple JMS providers.
          * If you need transaction against multiple JMS providers, use jms
@@ -2225,6 +2699,47 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies whether to test the connection on startup. This ensures
+         * that when Camel starts that all the JMS consumers have a valid
+         * connection to the JMS broker. If a connection cannot be granted then
+         * Camel throws an exception on startup. This ensures that Camel is not
+         * started with failed connections. The JMS producers is tested as well.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param testConnectionOnStartup the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointBuilder testConnectionOnStartup(
+                boolean testConnectionOnStartup) {
+            doSetProperty("testConnectionOnStartup", testConnectionOnStartup);
+            return this;
+        }
+        /**
+         * Specifies whether to test the connection on startup. This ensures
+         * that when Camel starts that all the JMS consumers have a valid
+         * connection to the JMS broker. If a connection cannot be granted then
+         * Camel throws an exception on startup. This ensures that Camel is not
+         * started with failed connections. The JMS producers is tested as well.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param testConnectionOnStartup the value to set
+         * @return the dsl builder
+         */
+        default SjmsEndpointBuilder testConnectionOnStartup(
+                String testConnectionOnStartup) {
+            doSetProperty("testConnectionOnStartup", testConnectionOnStartup);
+            return this;
+        }
+        /**
          * Specifies whether to use transacted mode.
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
@@ -2747,6 +3262,134 @@ public interface SjmsEndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies the interval between recovery attempts, i.e. when a
+         * connection is being refreshed, in milliseconds. The default is 5000
+         * ms, that is, 5 seconds.
+         * 
+         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 5000
+         * Group: advanced
+         * 
+         * @param recoveryInterval the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointBuilder recoveryInterval(
+                long recoveryInterval) {
+            doSetProperty("recoveryInterval", recoveryInterval);
+            return this;
+        }
+        /**
+         * Specifies the interval between recovery attempts, i.e. when a
+         * connection is being refreshed, in milliseconds. The default is 5000
+         * ms, that is, 5 seconds.
+         * 
+         * The option will be converted to a &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 5000
+         * Group: advanced
+         * 
+         * @param recoveryInterval the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointBuilder recoveryInterval(
+                String recoveryInterval) {
+            doSetProperty("recoveryInterval", recoveryInterval);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param synchronous the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointBuilder synchronous(boolean synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param synchronous the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointBuilder synchronous(String synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
+        /**
+         * If enabled and you are using Request Reply messaging (InOut) and an
+         * Exchange failed on the consumer side, then the caused Exception will
+         * be send back in response as a javax.jms.ObjectMessage. If the client
+         * is Camel, the returned Exception is rethrown. This allows you to use
+         * Camel JMS as a bridge in your routing - for example, using persistent
+         * queues to enable robust routing. Notice that if you also have
+         * transferExchange enabled, this option takes precedence. The caught
+         * exception is required to be serializable. The original Exception on
+         * the consumer side can be wrapped in an outer exception such as
+         * org.apache.camel.RuntimeCamelException when returned to the producer.
+         * Use this with caution as the data is using Java Object serialization
+         * and requires the received to be able to deserialize the data at Class
+         * level, which forces a strong coupling between the producers and
+         * consumer!.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param transferException the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointBuilder transferException(
+                boolean transferException) {
+            doSetProperty("transferException", transferException);
+            return this;
+        }
+        /**
+         * If enabled and you are using Request Reply messaging (InOut) and an
+         * Exchange failed on the consumer side, then the caused Exception will
+         * be send back in response as a javax.jms.ObjectMessage. If the client
+         * is Camel, the returned Exception is rethrown. This allows you to use
+         * Camel JMS as a bridge in your routing - for example, using persistent
+         * queues to enable robust routing. Notice that if you also have
+         * transferExchange enabled, this option takes precedence. The caught
+         * exception is required to be serializable. The original Exception on
+         * the consumer side can be wrapped in an outer exception such as
+         * org.apache.camel.RuntimeCamelException when returned to the producer.
+         * Use this with caution as the data is using Java Object serialization
+         * and requires the received to be able to deserialize the data at Class
+         * level, which forces a strong coupling between the producers and
+         * consumer!.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param transferException the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjmsEndpointBuilder transferException(
+                String transferException) {
+            doSetProperty("transferException", transferException);
+            return this;
+        }
+        /**
          * Specifies whether to share JMS session with other SJMS endpoints.
          * Turn this off if your route is accessing to multiple JMS providers.
          * If you need transaction against multiple JMS providers, use jms
diff --git a/docs/components/modules/ROOT/pages/sjms-component.adoc b/docs/components/modules/ROOT/pages/sjms-component.adoc
index e599043..ca85f3a 100644
--- a/docs/components/modules/ROOT/pages/sjms-component.adoc
+++ b/docs/components/modules/ROOT/pages/sjms-component.adoc
@@ -92,7 +92,7 @@ You append query options to the URI using the following format,
 == Component Options and Configurations
 
 // component options: START
-The Simple JMS component supports 18 options, which are listed below.
+The Simple JMS component supports 17 options, which are listed below.
 
 
 
@@ -102,8 +102,6 @@ The Simple JMS component supports 18 options, which are listed below.
 | *connectionCount* (common) | The maximum number of connections available to endpoints started under this component | 1 | Integer
 | *connectionFactory* (common) | *Autowired* A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource. |  | ConnectionFactory
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
-| *reconnectBackOff* (consumer) | Backoff in millis on consumer pool reconnection attempts | 5000 | long
-| *reconnectOnError* (consumer) | Try to apply reconnection logic on consumer pool | true | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
 | *connectionClientId* (advanced) | The client ID to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
@@ -113,6 +111,7 @@ The Simple JMS component supports 18 options, which are listed below.
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *jmsKeyFormatStrategy* (advanced) | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The default strategy will safely marshal dots and hyphens (. and -). 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  [...]
 | *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
+| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *connectionPassword* (security) | The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
 | *connectionUsername* (security) | The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
@@ -141,7 +140,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (40 parameters):
+=== Query Parameters (47 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -150,16 +149,19 @@ with the following path and query parameters:
 | *acknowledgementMode* (common) | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. There are 4 enums and the value can be one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | SessionAcknowledgementType
 | *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message broker [...]
 | *replyTo* (common) | Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer). |  | String
+| *testConnectionOnStartup* (common) | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | boolean
+| *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100% strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transac [...]
+| *autoStartup* (consumer) | Specifies whether the consumer container should auto-startup. | true | boolean
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *consumerCount* (consumer) | Sets the number of consumer listeners used for this endpoint. | 1 | int
 | *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
-| *reconnectBackOff* (consumer) | Backoff in millis on consumer pool reconnection attempts | 5000 | long
-| *reconnectOnError* (consumer) | Try to apply reconnection logic on consumer pool | true | boolean
 | *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
-| *synchronous* (consumer) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | true | boolean
+| *eagerLoadingOfProperties* (consumer) | Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes can catch early any issues with the underlying JMS provider and the use of JMS properties. See also the option eagerPoisonBody. | false | boolean
+| *eagerPoisonBody* (consumer) | If eagerLoadingOfProperties is enabled and the JMS message payload (JMS body or JMS properties) is poison (cannot be read/mapped), then set this text as the message body instead so the message can be processed (the cause of the poison are already stored as exception on the Exchange). This can be turned off by setting eagerPoisonBody=false. See also the option eagerLoadingOfProperties. | Poison JMS message due to ${exception.message} | String
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
 | *messageSelector* (consumer) | Sets the JMS Message selector syntax. |  | String
+| *replyToSameDestinationAllowed* (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
 | *deliveryMode* (producer) | Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2. There are 2 enums and the value can be one of: 1, 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
@@ -170,6 +172,7 @@ with the following path and query parameters:
 | *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
 | *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
+| *disableTimeToLive* (producer) | Use this option to force disabling time to live. For example when you do request/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message being sent. The problem is that the sender and receiver systems have to have their clocks synchronized, so they are in sync. This is not always so easy to archive. So you can use disableTimeToLive=true to not set a time to live value on the sent message. Then the message w [...]
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
 | *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
@@ -182,6 +185,9 @@ with the following path and query parameters:
 | *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 [...]
 | *mapJmsMessage* (advanced) | Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc. See section about how mapping works below for more details. | true | boolean
 | *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
+| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
+| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean


[camel] 02/07: polished code

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit a2896cf5a75e4d19eee93a0105689e90e8caf762
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jan 4 11:08:30 2021 +0100

    polished code
---
 .../org/apache/camel/component/jms/JmsProducer.java  | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
index 57d5c73..99acbc3 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
@@ -426,25 +426,9 @@ public class JmsProducer extends DefaultAsyncProducer {
 
         // destination should be preferred
         if (destination != null) {
-            if (inOut) {
-                if (template != null) {
-                    template.send(destination, messageCreator, callback);
-                }
-            } else {
-                if (template != null) {
-                    template.send(destination, messageCreator, callback);
-                }
-            }
+            template.send(destination, messageCreator, callback);
         } else if (destinationName != null) {
-            if (inOut) {
-                if (template != null) {
-                    template.send(destinationName, messageCreator, callback);
-                }
-            } else {
-                if (template != null) {
-                    template.send(destinationName, messageCreator, callback);
-                }
-            }
+            template.send(destinationName, messageCreator, callback);
         } else {
             throw new IllegalArgumentException(
                     "Neither destination nor destinationName is specified on this endpoint: " + endpoint);


[camel] 07/07: CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms (migrate)

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit b20430856f0179bb8d0985586b2e195b02dfff43
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 6 12:42:59 2021 +0100

    CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms (migrate)
---
 .../modules/ROOT/pages/camel-3x-upgrade-guide-3_8.adoc         | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_8.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_8.adoc
index 3d7f27c..c8ca5f5 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_8.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_8.adoc
@@ -10,6 +10,16 @@ from both 3.0 to 3.1 and 3.1 to 3.2.
 
 The JMS and ActiveMQ component now supports optimized toD EIP pattern by using a single endpoint/producer for dynamic destination names.
 
+=== camel-sjms and camel-sjms2
+
+These two components has been overhauled and re-written with the goals of being more feature complete with the Spring JMS component.
+They also no longer uses their own connection pooling, but let you use the existing 3rd party pooling for `ConnectionFactory` which is common practice.
+The components are now also reactive and non-blocking, and also supports optimized toD EIP pattern by using a single endpoint/producer for dynamic destination names.
+
+Many of the previous features and configuration options have been removed/renamed.
+To migrate you need to read their documentation and see what options they now offer.
+
+
 === Camel-AWS2-SNS
 
 The policy option now expects a file, since the policy are going to be complex. It can be from classpath:, http: or file: etc.


[camel] 04/07: CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms (producer)

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 53692037a023ce7a15c9641729911e2ae31fbe63
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 6 07:45:53 2021 +0100

    CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms (producer)
---
 .../org/apache/camel/catalog/components/sjms.json  |   34 +-
 .../org/apache/camel/catalog/components/sjms2.json |   34 +-
 .../apache/camel/catalog/docs/sjms-component.adoc  |  262 +----
 .../apache/camel/catalog/docs/sjms2-component.adoc |  480 ++------
 components/camel-sjms/pom.xml                      |   12 +-
 .../component/sjms/SjmsComponentConfigurer.java    |   60 +-
 .../component/sjms/SjmsEndpointConfigurer.java     |   42 +-
 .../component/sjms/SjmsEndpointUriFactory.java     |    9 +-
 .../org/apache/camel/component/sjms/sjms.json      |   18 +-
 .../camel-sjms/src/main/docs/sjms-component.adoc   |  262 +----
 .../component/sjms/MessageConsumerResources.java   |   55 -
 .../component/sjms/MessageListenerContainer.java   |    3 +
 .../camel/component/sjms/OldSjmsConsumer.java      |  420 -------
 ...sactionCommitStrategy.java => ReplyToType.java} |   19 +-
 .../apache/camel/component/sjms/SjmsComponent.java |  165 +--
 .../apache/camel/component/sjms/SjmsEndpoint.java  |  199 ++--
 .../apache/camel/component/sjms/SjmsHelper.java    |   32 +-
 .../apache/camel/component/sjms/SjmsProducer.java  |  541 +++++++--
 .../apache/camel/component/sjms/SjmsTemplate.java  |   51 +-
 .../component/sjms/TransactionOnCompletion.java    |   68 ++
 .../sjms/consumer/AbstractMessageHandler.java      |  176 ---
 .../sjms/consumer/InOnlyMessageHandler.java        |   87 --
 .../sjms/consumer/InOutMessageHandler.java         |  175 ---
 .../consumer/SimpleMessageListenerContainer.java   |   86 +-
 .../sjms/jms/ConnectionFactoryResource.java        |  190 ----
 .../component/sjms/jms/ConnectionResource.java     |   51 -
 .../component/sjms/jms/Jms11ObjectFactory.java     |    5 +
 .../camel/component/sjms/jms/JmsObjectFactory.java |    2 +
 .../MessageCreator.java}                           |   16 +-
 .../component/sjms/producer/InOnlyProducer.java    |  145 ---
 .../component/sjms/producer/InOutProducer.java     |  291 -----
 .../sjms/reply/CorrelationTimeoutMap.java          |   70 ++
 .../ExclusiveQueueMessageListenerContainer.java    |   48 +
 .../sjms/reply/MessageSelectorCreator.java         |   86 ++
 .../QueueReplyHandler.java}                        |   18 +-
 .../component/sjms/reply/QueueReplyManager.java    |  142 +++
 .../ReplyHandler.java}                             |   32 +-
 .../camel/component/sjms/reply/ReplyHolder.java    |  124 ++
 .../camel/component/sjms/reply/ReplyManager.java   |  112 ++
 .../component/sjms/reply/ReplyManagerSupport.java  |  264 +++++
 .../TemporaryQueueMessageListenerContainer.java    |   43 +
 .../sjms/reply/TemporaryQueueReplyHandler.java     |   64 ++
 .../sjms/reply/TemporaryQueueReplyManager.java     |  169 +++
 .../apache/camel/component/sjms/reply/package.html |   27 +
 .../sjms/tx/SessionTransactionSynchronization.java |  118 --
 .../component/sjms/ReconnectInOutProducerTest.java |    8 -
 .../component/sjms/ReconnectProducerTest.java      |    9 +-
 .../sjms/SjmsDestinationCreationStrategyTest.java  |   92 --
 .../sjms/SjmsEndpointConnectionSettingsTest.java   |   13 -
 .../sjms/consumer/InOnlyConsumerAsyncTrueTest.java |   59 -
 .../consumer/InOnlyTopicDurableConsumerTest.java   |    2 +-
 .../sjms/consumer/InOutConcurrentConsumerTest.java |    4 +-
 .../sjms/consumer/InOutConsumerQueueAsyncTest.java |   13 +-
 .../consumer/InOutConsumerTempQueueAsyncTest.java  |   16 +-
 .../consumer/InOutSynchronousConsumerTest.java     |    4 +-
 .../component/sjms/it/ConnectionResourceIT.java    |  137 ---
 .../sjms/jms/ConnectionFactoryResourceTest.java    |  109 --
 .../producer/InOutQueueProducerAsyncLoadTest.java  |    2 +-
 .../producer/InOutQueueProducerSyncLoadTest.java   |    2 +-
 .../component/sjms/producer/QueueProducerTest.java |    6 -
 .../sjms/tx/TransactedConcurrentConsumersTest.java |    4 +-
 .../sjms/tx/TransactedConsumerSupport.java         |   10 +-
 .../tx/TransactedConsumersMultipleRouteTest.java   |    4 +-
 .../sjms/tx/TransactedQueueConsumerTest.java       |    4 +-
 .../sjms/tx/TransactedTopicConsumerTest.java       |    5 +-
 .../sjms/tx/TransactedTopicProducerTest.java       |    2 +-
 .../component/sjms2/Sjms2EndpointUriFactory.java   |   56 +-
 .../org/apache/camel/component/sjms2/sjms2.json    |   34 +-
 .../camel-sjms2/src/main/docs/sjms2-component.adoc |  480 ++------
 .../component/sjms2/jms/Jms2ObjectFactory.java     |   18 +
 .../sjms2/Sjms2EndpointConnectionSettingsTest.java |   76 --
 .../consumer/InOnlyTopicDurableConsumerTest.java   |   23 +-
 .../consumer/InOnlyTopicSharedConsumerTest.java    |    6 -
 .../dsl/Sjms2ComponentBuilderFactory.java          |  209 ++--
 .../component/dsl/SjmsComponentBuilderFactory.java |  159 +--
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  | 1187 +++++++++++++++-----
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   |  358 +++---
 .../modules/ROOT/pages/sjms-component.adoc         |  262 +----
 .../modules/ROOT/pages/sjms2-component.adoc        |  480 ++------
 79 files changed, 3795 insertions(+), 5365 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms.json
index 47a2980..9e065f0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms.json
@@ -25,21 +25,17 @@
     "connectionCount": { "kind": "property", "displayName": "Connection Count", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "description": "The maximum number of connections available to endpoints started under this component" },
     "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": true, "secret": false, "description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource." },
     "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
-    "reconnectBackOff": { "kind": "property", "displayName": "Reconnect Back Off", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 5000, "description": "Backoff in millis on consumer pool reconnection attempts" },
-    "reconnectOnError": { "kind": "property", "displayName": "Reconnect On Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Try to apply reconnection logic on consumer pool" },
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
     "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
-    "connectionClientId": { "kind": "property", "displayName": "Connection Client Id", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The client ID to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "connectionMaxWait": { "kind": "property", "displayName": "Connection Max Wait", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 5000, "description": "The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "connectionResource": { "kind": "property", "displayName": "Connection Resource", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.ConnectionResource", "deprecated": false, "autowired": false, "secret": false, "description": "A ConnectionResource is an interface that allows for customization and container control of the ConnectionFactory. See Plugable Connection Resource Management for further details." },
-    "connectionTestOnBorrow": { "kind": "property", "displayName": "Connection Test On Borrow", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource then should each javax.jms.Connection be tested before being used." },
     "destinationCreationStrategy": { "kind": "property", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
     "jmsKeyFormatStrategy": { "kind": "property", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The defau [...]
     "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
+    "recoveryInterval": { "kind": "property", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
+    "replyToOnTimeoutMaxConcurrentConsumers": { "kind": "property", "displayName": "Reply To On Timeout Max Concurrent Consumers", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request\/reply over JMS." },
+    "requestTimeoutCheckerInterval": { "kind": "property", "displayName": "Request Timeout Checker Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Configures how often Camel should check for timed out Exchanges when doing request\/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeou [...]
     "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
-    "connectionPassword": { "kind": "property", "displayName": "Connection Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "connectionUsername": { "kind": "property", "displayName": "Connection Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "transactionCommitStrategy": { "kind": "property", "displayName": "Transaction Commit Strategy", "group": "transaction", "label": "transaction", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.TransactionCommitStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To configure which kind of commit strategy to use. Camel provides two implementations out of the box, default and batch." }
+    "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
+    "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }
   },
   "properties": {
     "destinationType": { "kind": "path", "displayName": "Destination Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "queue", "topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "queue", "description": "The kind of destination to use" },
@@ -47,31 +43,37 @@
     "acknowledgementMode": { "kind": "parameter", "displayName": "Acknowledgement Mode", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.SessionAcknowledgementType", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "description": "The JMS acknowledgement name, which is one of:  [...]
     "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from  [...]
     "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
+    "testConnectionOnStartup": { "kind": "parameter", "displayName": "Test Connection On Startup", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel [...]
+    "asyncConsumer": { "kind": "parameter", "displayName": "Async Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asy [...]
+    "autoStartup": { "kind": "parameter", "displayName": "Auto Startup", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether the consumer container should auto-startup." },
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
-    "consumerCount": { "kind": "parameter", "displayName": "Consumer Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Sets the number of consumer listeners used for this endpoint." },
+    "concurrentConsumers": { "kind": "parameter", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the default number of concurrent consumers when consuming from JMS (not for request\/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up\/down of threads. When doing r [...]
     "durableSubscriptionId": { "kind": "parameter", "displayName": "Durable Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the durable subscription Id required for durable topics." },
-    "reconnectBackOff": { "kind": "parameter", "displayName": "Reconnect Back Off", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Backoff in millis on consumer pool reconnection attempts" },
-    "reconnectOnError": { "kind": "parameter", "displayName": "Reconnect On Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Try to apply reconnection logic on consumer pool" },
     "replyToDeliveryPersistent": { "kind": "parameter", "displayName": "Reply To Delivery Persistent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to use persistent delivery by default for replies." },
-    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported)." },
+    "eagerLoadingOfProperties": { "kind": "parameter", "displayName": "Eager Loading Of Properties", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes c [...]
+    "eagerPoisonBody": { "kind": "parameter", "displayName": "Eager Poison Body", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Poison JMS message due to ${exception.message}", "description": "If eagerLoadingOfProperties is enabled and the JMS message payload (JMS body or JMS properties) is poison (cannot be read\/mapped), then se [...]
     "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
     "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
     "messageSelector": { "kind": "parameter", "displayName": "Message Selector", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the JMS Message selector syntax." },
+    "replyToSameDestinationAllowed": { "kind": "parameter", "displayName": "Reply To Same Destination Allowed", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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 c [...]
     "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2." },
     "deliveryPersistent": { "kind": "parameter", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether persistent delivery is used by default." },
     "explicitQosEnabled": { "kind": "parameter", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "description": "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 timeToLi [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
     "preserveMessageQos": { "kind": "parameter", "displayName": "Preserve Message Qos", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDelive [...]
     "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "description": "Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in orde [...]
+    "replyToConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the default number of concurrent consumers when doing request\/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up\/down of threads." },
     "replyToOverride": { "kind": "parameter", "displayName": "Reply To Override", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination." },
+    "replyToType": { "kind": "parameter", "displayName": "Reply To Type", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.ReplyToType", "enum": [ "Temporary", "Exclusive" ], "deprecated": false, "autowired": false, "secret": false, "description": "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 Exclusi [...]
     "requestTimeout": { "kind": "parameter", "displayName": "Request Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "20000", "description": "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 timeou [...]
     "timeToLive": { "kind": "parameter", "displayName": "Time To Live", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "description": "When sending messages, specifies the time-to-live of the message (in milliseconds)." },
     "allowNullBody": { "kind": "parameter", "displayName": "Allow Null Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an JMSException is thrown." },
+    "disableTimeToLive": { "kind": "parameter", "displayName": "Disable Time To Live", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Use this option to force disabling time to live. For example when you do request\/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message  [...]
+    "includeSentJMSMessageID": { "kind": "parameter", "displayName": "Include Sent JMSMessage ID", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was  [...]
     "asyncStartListener": { "kind": "parameter", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/o [...]
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to stop the consumer message listener asynchronously, when stopping a route." },
     "connectionCount": { "kind": "parameter", "displayName": "Connection Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "description": "The maximum number of connections available to this endpoint" },
     "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any" },
-    "connectionResource": { "kind": "parameter", "displayName": "Connection Resource", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.ConnectionResource", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any" },
     "destinationCreationStrategy": { "kind": "parameter", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
     "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
@@ -79,10 +81,12 @@
     "jmsKeyFormatStrategy": { "kind": "parameter", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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 pass [...]
     "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc. See section about how mapping works below for more details." },
     "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
+    "recoveryInterval": { "kind": "parameter", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
+    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
+    "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client i [...]
     "errorHandlerLoggingLevel": { "kind": "parameter", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "description": "Allows to configure the default errorHandler logging level for logging uncaught exceptions." },
     "errorHandlerLogStackTrace": { "kind": "parameter", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Allows to control whether stacktraces should be logged or not, by the default errorHandler." },
     "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to use transacted mode" },
-    "transactionCommitStrategy": { "kind": "parameter", "displayName": "Transaction Commit Strategy", "group": "transaction", "label": "transaction", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.TransactionCommitStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the commit strategy." },
     "sharedJMSSession": { "kind": "parameter", "displayName": "Shared JMSSession", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS provi [...]
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms2.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms2.json
index 8117c35..4fe444a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms2.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms2.json
@@ -25,21 +25,17 @@
     "connectionCount": { "kind": "property", "displayName": "Connection Count", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "description": "The maximum number of connections available to endpoints started under this component" },
     "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": true, "secret": false, "description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource." },
     "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
-    "reconnectBackOff": { "kind": "property", "displayName": "Reconnect Back Off", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 5000, "description": "Backoff in millis on consumer pool reconnection attempts" },
-    "reconnectOnError": { "kind": "property", "displayName": "Reconnect On Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Try to apply reconnection logic on consumer pool" },
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
     "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
-    "connectionClientId": { "kind": "property", "displayName": "Connection Client Id", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The client ID to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "connectionMaxWait": { "kind": "property", "displayName": "Connection Max Wait", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 5000, "description": "The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "connectionResource": { "kind": "property", "displayName": "Connection Resource", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.ConnectionResource", "deprecated": false, "autowired": false, "secret": false, "description": "A ConnectionResource is an interface that allows for customization and container control of the ConnectionFactory. See Plugable Connection Resource Management for further details." },
-    "connectionTestOnBorrow": { "kind": "property", "displayName": "Connection Test On Borrow", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource then should each javax.jms.Connection be tested before being used." },
     "destinationCreationStrategy": { "kind": "property", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
     "jmsKeyFormatStrategy": { "kind": "property", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The defau [...]
     "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
+    "recoveryInterval": { "kind": "property", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
+    "replyToOnTimeoutMaxConcurrentConsumers": { "kind": "property", "displayName": "Reply To On Timeout Max Concurrent Consumers", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request\/reply over JMS." },
+    "requestTimeoutCheckerInterval": { "kind": "property", "displayName": "Request Timeout Checker Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Configures how often Camel should check for timed out Exchanges when doing request\/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeou [...]
     "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
-    "connectionPassword": { "kind": "property", "displayName": "Connection Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "connectionUsername": { "kind": "property", "displayName": "Connection Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "transactionCommitStrategy": { "kind": "property", "displayName": "Transaction Commit Strategy", "group": "transaction", "label": "transaction", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.TransactionCommitStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To configure which kind of commit strategy to use. Camel provides two implementations out of the box, default and batch." }
+    "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
+    "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }
   },
   "properties": {
     "destinationType": { "kind": "path", "displayName": "Destination Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "queue", "topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "queue", "description": "The kind of destination to use" },
@@ -47,34 +43,40 @@
     "acknowledgementMode": { "kind": "parameter", "displayName": "Acknowledgement Mode", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.SessionAcknowledgementType", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "description": "The JMS acknowledgement name, which is one of:  [...]
     "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from  [...]
     "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
+    "testConnectionOnStartup": { "kind": "parameter", "displayName": "Test Connection On Startup", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel [...]
+    "asyncConsumer": { "kind": "parameter", "displayName": "Async Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asy [...]
+    "autoStartup": { "kind": "parameter", "displayName": "Auto Startup", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether the consumer container should auto-startup." },
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
-    "consumerCount": { "kind": "parameter", "displayName": "Consumer Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Sets the number of consumer listeners used for this endpoint." },
+    "concurrentConsumers": { "kind": "parameter", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the default number of concurrent consumers when consuming from JMS (not for request\/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up\/down of threads. When doing r [...]
     "durable": { "kind": "parameter", "displayName": "Durable", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets topic consumer to durable." },
     "durableSubscriptionId": { "kind": "parameter", "displayName": "Durable Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the durable subscription Id required for durable topics." },
-    "reconnectBackOff": { "kind": "parameter", "displayName": "Reconnect Back Off", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Backoff in millis on consumer pool reconnection attempts" },
-    "reconnectOnError": { "kind": "parameter", "displayName": "Reconnect On Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Try to apply reconnection logic on consumer pool" },
     "replyToDeliveryPersistent": { "kind": "parameter", "displayName": "Reply To Delivery Persistent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to use persistent delivery by default for replies." },
     "shared": { "kind": "parameter", "displayName": "Shared", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets the consumer to shared." },
     "subscriptionId": { "kind": "parameter", "displayName": "Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the subscription Id, required for durable or shared topics." },
-    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported)." },
+    "eagerLoadingOfProperties": { "kind": "parameter", "displayName": "Eager Loading Of Properties", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes c [...]
+    "eagerPoisonBody": { "kind": "parameter", "displayName": "Eager Poison Body", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Poison JMS message due to ${exception.message}", "description": "If eagerLoadingOfProperties is enabled and the JMS message payload (JMS body or JMS properties) is poison (cannot be read\/mapped), then se [...]
     "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
     "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
     "messageSelector": { "kind": "parameter", "displayName": "Message Selector", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the JMS Message selector syntax." },
+    "replyToSameDestinationAllowed": { "kind": "parameter", "displayName": "Reply To Same Destination Allowed", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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 c [...]
     "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2." },
     "deliveryPersistent": { "kind": "parameter", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether persistent delivery is used by default." },
     "explicitQosEnabled": { "kind": "parameter", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "description": "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 timeToLi [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
     "preserveMessageQos": { "kind": "parameter", "displayName": "Preserve Message Qos", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDelive [...]
     "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "description": "Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in orde [...]
+    "replyToConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the default number of concurrent consumers when doing request\/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up\/down of threads." },
     "replyToOverride": { "kind": "parameter", "displayName": "Reply To Override", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination." },
+    "replyToType": { "kind": "parameter", "displayName": "Reply To Type", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.ReplyToType", "enum": [ "Temporary", "Exclusive" ], "deprecated": false, "autowired": false, "secret": false, "description": "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 Exclusi [...]
     "requestTimeout": { "kind": "parameter", "displayName": "Request Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "20000", "description": "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 timeou [...]
     "timeToLive": { "kind": "parameter", "displayName": "Time To Live", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "description": "When sending messages, specifies the time-to-live of the message (in milliseconds)." },
     "allowNullBody": { "kind": "parameter", "displayName": "Allow Null Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an JMSException is thrown." },
+    "disableTimeToLive": { "kind": "parameter", "displayName": "Disable Time To Live", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Use this option to force disabling time to live. For example when you do request\/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message  [...]
+    "includeSentJMSMessageID": { "kind": "parameter", "displayName": "Include Sent JMSMessage ID", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was  [...]
     "asyncStartListener": { "kind": "parameter", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/o [...]
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to stop the consumer message listener asynchronously, when stopping a route." },
     "connectionCount": { "kind": "parameter", "displayName": "Connection Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "description": "The maximum number of connections available to this endpoint" },
     "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any" },
-    "connectionResource": { "kind": "parameter", "displayName": "Connection Resource", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.ConnectionResource", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any" },
     "destinationCreationStrategy": { "kind": "parameter", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
     "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
@@ -82,10 +84,12 @@
     "jmsKeyFormatStrategy": { "kind": "parameter", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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 pass [...]
     "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc. See section about how mapping works below for more details." },
     "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
+    "recoveryInterval": { "kind": "parameter", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
+    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
+    "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client i [...]
     "errorHandlerLoggingLevel": { "kind": "parameter", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "description": "Allows to configure the default errorHandler logging level for logging uncaught exceptions." },
     "errorHandlerLogStackTrace": { "kind": "parameter", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Allows to control whether stacktraces should be logged or not, by the default errorHandler." },
     "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to use transacted mode" },
-    "transactionCommitStrategy": { "kind": "parameter", "displayName": "Transaction Commit Strategy", "group": "transaction", "label": "transaction", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.TransactionCommitStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the commit strategy." },
     "sharedJMSSession": { "kind": "parameter", "displayName": "Shared JMSSession", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS provi [...]
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc
index cdabfaa..eaf6c55 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms-component.adoc
@@ -12,33 +12,22 @@ include::{cq-version}@camel-quarkus:ROOT:partial$reference/components/sjms.adoc[
 
 *{component-header}*
 
-The Simple JMS Component, or SJMS, is a JMS client for use with Camel
-that uses well known best practices when it comes to JMS client creation
-and configuration. SJMS contains a brand new JMS client API written
-explicitly for Camel eliminating third party messaging implementations
-keeping it light and resilient. The following features is included:
+The Simple JMS Component is a JMS component that only uses JMS APIs
+and no 3rd-party framework such as Spring JMS.
 
-// TODO: Update this after refactor
+The component was reworked from Camel 3.8 onwards
+to be similar to the existing Camel JMS component that is based on Spring JMS.
 
-* Standard Queue and Topic Support (Durable & Non-Durable)
-* InOnly & InOut MEP Support
-* Asynchronous Producer and Consumer Processing
-* Internal JMS Transaction Support
+The reason is to offer many of the same features and functionality from the JMS component,
+but for users that requires lightweight without having to include the Spring Framework.
 
-Additional key features include:
+There are some advanced features in the Spring JMS component that has been omitted, such as
+shared queues for request/reply. Spring JMS offers fine grained tunings for concurrency settings,
+which can be tweaked for dynamic scaling up and down depending on load. This is a special feature in Spring JMS
+that would require substantial code to implement in SJMS.
 
-* Plugable Connection Resource Management
-* Session, Consumer, & Producer Pooling & Caching Management
-* Support for Customizable Transaction Commit Strategies (Local JMS
-Transactions only)
-
-[NOTE]
-====
-*Why the S in SJMS*
-
-S stands for Simple and Standard and Springless. Also camel-jms was
-already taken.
-====
+The SJMS component does not support for Spring or JTA Transaction, however support for internal local transactions
+is supported using JMS or Transaction or Client Acknowledge Mode. See more further below.
 
 Maven users will need to add the following dependency to their `pom.xml`
 for this component:
@@ -90,7 +79,7 @@ You append query options to the URI using the following format,
 == Component Options and Configurations
 
 // component options: START
-The Simple JMS component supports 17 options, which are listed below.
+The Simple JMS component supports 14 options, which are listed below.
 
 
 
@@ -102,18 +91,15 @@ The Simple JMS component supports 17 options, which are listed below.
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
-| *connectionClientId* (advanced) | The client ID to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
-| *connectionMaxWait* (advanced) | The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. | 5000 | long
-| *connectionResource* (advanced) | A ConnectionResource is an interface that allows for customization and container control of the ConnectionFactory. See Plugable Connection Resource Management for further details. |  | ConnectionResource
-| *connectionTestOnBorrow* (advanced) | When using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource then should each javax.jms.Connection be tested before being used. | true | boolean
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *jmsKeyFormatStrategy* (advanced) | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The default strategy will safely marshal dots and hyphens (. and -). 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  [...]
 | *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
 | *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
+| *replyToOnTimeoutMaxConcurrent{zwsp}Consumers* (advanced) | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS. | 1 | int
+| *requestTimeoutCheckerInterval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
-| *connectionPassword* (security) | The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
-| *connectionUsername* (security) | The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
-| *transactionCommitStrategy* (transaction) | To configure which kind of commit strategy to use. Camel provides two implementations out of the box, default and batch. |  | TransactionCommitStrategy
+| *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
+| *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 |===
 // component options: END
 
@@ -138,7 +124,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (47 parameters):
+=== Query Parameters (48 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -151,7 +137,7 @@ with the following path and query parameters:
 | *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100% strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transac [...]
 | *autoStartup* (consumer) | Specifies whether the consumer container should auto-startup. | true | boolean
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
-| *consumerCount* (consumer) | Sets the number of consumer listeners used for this endpoint. | 1 | int
+| *concurrentConsumers* (consumer) | Specifies the default number of concurrent consumers when consuming from JMS (not for request/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. When doing request/reply over JMS then the option replyToConcurrentConsumers is used to control number of concurrent consumers on the reply message listener. | 1 | int
 | *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
 | *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
 | *eagerLoadingOfProperties* (consumer) | Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes can catch early any issues with the underlying JMS provider and the use of JMS properties. See also the option eagerPoisonBody. | false | boolean
@@ -166,16 +152,18 @@ with the following path and query parameters:
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
+| *replyToConcurrentConsumers* (producer) | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. | 1 | int
 | *replyToOverride* (producer) | Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination. |  | String
+| *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  [...]
 | *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
 | *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
 | *disableTimeToLive* (producer) | Use this option to force disabling time to live. For example when you do request/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message being sent. The problem is that the sender and receiver systems have to have their clocks synchronized, so they are in sync. This is not always so easy to archive. So you can use disableTimeToLive=true to not set a time to live value on the sent message. Then the message w [...]
+| *includeSentJMSMessageID* (producer) | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination. | false | boolean
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
 | *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
 | *connectionFactory* (advanced) | Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any |  | ConnectionFactory
-| *connectionResource* (advanced) | Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any |  | ConnectionResource
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *exceptionListener* (advanced) | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. |  | ExceptionListener
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
@@ -189,97 +177,13 @@ with the following path and query parameters:
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
-| *transactionCommitStrategy* (transaction) | Sets the commit strategy. |  | TransactionCommitStrategy
 | *sharedJMSSession* (transaction) | Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS providers, use jms component to leverage XA transaction. | true | boolean
 |===
 // endpoint options: END
 
 
 Below is an example of how to configure the `SjmsComponent` with its
-required `ConnectionFactory` provider. It will create a single connection
-by default and store it using the components internal pooling APIs to
-ensure that it is able to service Session creation requests in a thread
-safe manner.
-
-[source,java]
-----
-SjmsComponent component = new SjmsComponent();
-component.setConnectionFactory(new ActiveMQConnectionFactory("tcp://localhost:61616"));
-getContext().addComponent("sjms", component);
-----
-
-For a SJMS component that is required to support a durable subscription,
-you can override the default `ConnectionFactoryResource` instance and set
-the `clientId` property.
-
-[source,java]
-----
-ConnectionFactoryResource connectionResource = new ConnectionFactoryResource();
-connectionResource.setConnectionFactory(new ActiveMQConnectionFactory("tcp://localhost:61616"));
-connectionResource.setClientId("myclient-id");
-
-SjmsComponent component = new SjmsComponent();
-component.setConnectionResource(connectionResource);
-component.setMaxConnections(1);
-----
-
-== Producer Usage
-
-=== InOnly Producer - (Default)
-
-The _InOnly_ producer is the default behavior of the SJMS Producer
-Endpoint.
-
-[source,java]
-----
-from("direct:start")
-    .to("sjms:queue:bar");
-----
-
-=== InOut Producer
-
-To enable _InOut_ behavior append the `exchangePattern` attribute to the
-URI. By default it will use a dedicated TemporaryQueue for each
-consumer.
-
-[source,java]
-----
-from("direct:start")
-    .to("sjms:queue:bar?exchangePattern=InOut");
-----
-
-You can specify a `replyTo` though which can provide a better
-monitor point.
-
-[source,java]
-----
-from("direct:start")
-    .to("sjms:queue:bar?replyTo=my.reply.to.queue");
-----
-
-== Consumer Usage
-
-=== InOnly Consumer - (Default)
-
-The _InOnly_ consumer is the default Exchange behavior of the SJMS
-Consumer Endpoint.
-
-[source,java]
-----
-from("sjms:queue:bar")
-    .to("mock:result");
-----
-
-=== InOut Consumer
-
-To enable _InOut_ behavior append the `exchangePattern` attribute to the
-URI.
-
-[source,java]
-----
-from("sjms:queue:in.out.test?exchangePattern=InOut")
-    .transform(constant("Bye Camel"));
-----
+required `ConnectionFactory` provider.
 
 
 == Reuse endpoint and send to different destinations computed at runtime
@@ -350,89 +254,29 @@ from("direct:order")
   .toD("sjms:order-${header.orderType}");
 --------------------------------
 
-== Advanced Usage Notes
-
-=== Plugable Connection Resource Management [[SJMS-connectionresource]]
-
-SJMS provides JMS `Connection`
-resource management through built-in connection pooling. This eliminates
-the need to depend on third party API pooling logic. However there may
-be times that you are required to use an external Connection resource
-manager such as those provided by J2EE or OSGi containers. For this SJMS
-provides an interface that can be used to override the internal SJMS
-Connection pooling capabilities. This is accomplished through the `ConnectionResource` interface.
-
-The `ConnectionResource`
-provides methods for borrowing and returning Connections as needed is
-the contract used to provide `Connection`
-pools to the SJMS component. A user should use when it is necessary to
-integrate SJMS with an external connection pooling manager.
+== Additional Notes
 
-It is recommended though that for standard JMS `ConnectionFactory`
-providers you use the `ConnectionFactoryResource`
-implementation that is provided with SJMS as-is or extend as it is
-optimized for this component.
+=== Local transactions
 
-Below is an example of using the plugable ConnectionResource with the
-ActiveMQ `PooledConnectionFactory`:
+When using `transacted=true` then JMS Transacted Acknowledge Mode are in use.
+The SJMS component supports this from both the consumer and producers. If a consumer
+is transacted, then the active JMS Session will commit or rollback at the end of processing the message.
 
-[source,java]
-----
-public class AMQConnectionResource implements ConnectionResource {
-    private PooledConnectionFactory pcf;
-
-    public AMQConnectionResource(String connectString, int maxConnections) {
-        super();
-        pcf = new PooledConnectionFactory(connectString);
-        pcf.setMaxConnections(maxConnections);
-        pcf.start();
-    }
-
-    public void stop() {
-        pcf.stop();
-    }
-
-    @Override
-    public Connection borrowConnection() throws Exception {
-        Connection answer = pcf.createConnection();
-        answer.start();
-        return answer;
-    }
-
-    @Override
-    public Connection borrowConnection(long timeout) throws Exception {
-        // SNIPPED...
-    }
-
-    @Override
-    public void returnConnection(Connection connection) throws Exception {
-        // Do nothing since there isn't a way to return a Connection
-        // to the instance of PooledConnectionFactory
-        log.info("Connection returned");
-    }
-}
-----
+SJMS producers that are `transacted=true` will also defer until the end of processing the message
+before the the active JMS Session will commit or rollback.
 
-Then pass in the `ConnectionResource` to the `SjmsComponent`:
+You can combine consumer and producer, such as:
 
 [source,java]
 ----
-CamelContext camelContext = new DefaultCamelContext();
-AMQConnectionResource pool = new AMQConnectionResource("tcp://localhost:33333", 1);
-SjmsComponent component = new SjmsComponent();
-component.setConnectionResource(pool);
-camelContext.addComponent("sjms", component);
+from("sjms:cheese?transacted=true")
+  .to("bean:foo")
+  .to("sjms:foo?transacted=true")
+  .to("bean:bar");
 ----
 
-=== Customizable Transaction Commit Strategies (Local JMS Transactions only)
-
-SJMS provides a developer the means to create a custom and plugable
-transaction strategy through the use of the `TransactionCommitStrategy`
-interface. This allows a user to define a unique set of circumstances
-that the `SessionTransactionSynchronization`
-will use to determine when to commit the Session.
-
-== Additional Notes
+Here the consumer and producer are both transacted, which means that only at the end of processing the message,
+then both the consumer and the producer will commit (or rollback in case of an exception during routing).
 
 === Message Header Format
 
@@ -468,18 +312,13 @@ dropped.
 === Clustering
 
 When using _InOut_ with SJMS in a clustered environment you must either
-use TemporaryQueue destinations or use a unique named reply to
+use TemporaryQueue destinations or use a unique reply to
 destination per InOut producer endpoint. Message correlation is handled
-by the endpoint, not with message selectors at the broker. The InOut
-Producer Endpoint uses Java Concurrency Exchangers cached by the Message
-`JMSCorrelationID`. This provides a nice performance increase while
-reducing the overhead on the broker since all the messages are consumed
-from the destination in the order they are produced by the interested
-consumer.
+by the producer, not with message selectors at the broker.
 
 [NOTE]
 ====
-You should only use queues as destination types, topics is not recommended or fully supported.
+You should only use queues as reply-to destination types, topics is not recommended or fully supported.
 ====
 
 Currently the only correlation strategy is to use the `JMSCorrelationId`.
@@ -487,26 +326,5 @@ The _InOut_ Consumer uses this strategy as well ensuring that all
 responses messages to the included `JMSReplyTo` destination also have the
 `JMSCorrelationId` copied from the request as well.
 
-== Transaction Support [[SJMS-transactions]]
-
-SJMS currently only supports the use of internal JMS Transactions. There
-is no support for the Camel Transaction Processor or the Java
-Transaction API (JTA).
-
-=== Does Springless Mean I Can't Use Spring?
-
-Not at all. Below is an example of the SJMS component using the Spring XML:
-
-[source,xml]
-----
-<route>
-    <from uri="direct:invoke.named.reply.to.queue" />
-    <to uri="sjms:queue:named.reply.to.queue?namedReplyTo=my.response.queue" />
-</route>
-----
-
-Springless refers to moving away from the dependency on the Spring JMS
-API. A new JMS client API is being developed from the ground up to power
-SJMS.
 
 include::camel-spring-boot::page$sjms-starter.adoc[]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms2-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms2-component.adoc
index 133a721..a638296 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms2-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sjms2-component.adoc
@@ -12,33 +12,22 @@ include::{cq-version}@camel-quarkus:ROOT:partial$reference/components/sjms2.adoc
 
 *{component-header}*
 
-The Simple JMS 2.0 Component, or SJMS2, is a JMS client for use with Camel
-that uses well known best practices when it comes to JMS client creation
-and configuration. SJMS2 contains a brand new JMS 2.0 client API written
-explicitly for Camel eliminating third party messaging implementations
-keeping it light and resilient. The following features is included:
-
-* Standard Queue and Topic Support (Durable & Non-Durable)
-* InOnly & InOut MEP Support
-* Asynchronous Producer and Consumer Processing
-* Internal JMS Transaction Support
-
-Additional key features include:
-
-* Plugable Connection Resource Management
-* Session, Consumer, & Producer Pooling & Caching Management
-* Batch Consumers and Producers
-* Transacted Batch Consumers & Producers
-* Support for Customizable Transaction Commit Strategies (Local JMS
-Transactions only)
+The Simple JMS Component is a JMS component that only uses JMS APIs
+and no 3rd-party framework such as Spring JMS.
 
-[NOTE]
-====
-*Why the S in SJMS*
+The component was reworked from Camel 3.8 onwards
+to be similar to the existing Camel JMS component that is based on Spring JMS.
 
-S stands for Simple and Standard and Springless. Also camel-jms was
-already taken.
-====
+The reason is to offer many of the same features and functionality from the JMS component,
+but for users that requires lightweight without having to include the Spring Framework.
+
+There are some advanced features in the Spring JMS component that has been omitted, such as
+shared queues for request/reply. Spring JMS offers fine grained tunings for concurrency settings,
+which can be tweaked for dynamic scaling up and down depending on load. This is a special feature in Spring JMS
+that would require substantial code to implement in SJMS2.
+
+The SJMS2 component does not support for Spring or JTA Transaction, however support for internal local transactions
+is supported using JMS or Transaction or Client Acknowledge Mode. See more further below.
 
 Maven users will need to add the following dependency to their `pom.xml`
 for this component:
@@ -55,7 +44,7 @@ for this component:
 
 == URI format
 
-[source]
+[source,text]
 ----
 sjms2:[queue:|topic:]destinationName[?options]
 ----
@@ -64,14 +53,14 @@ Where `destinationName` is a JMS queue or topic name. By default, the
 `destinationName` is interpreted as a queue name. For example, to
 connect to the queue, `FOO.BAR` use:
 
-[source]
+[source,text]
 ----
 sjms2:FOO.BAR
 ----
 
 You can include the optional `queue:` prefix, if you prefer:
 
-[source]
+[source,text]
 ----
 sjms2:queue:FOO.BAR
 ----
@@ -79,7 +68,7 @@ sjms2:queue:FOO.BAR
 To connect to a topic, you _must_ include the `topic:` prefix. For
 example, to connect to the topic, `Stocks.Prices`, use:
 
-[source]
+[source,text]
 ----
 sjms2:topic:Stocks.Prices
 ----
@@ -89,11 +78,8 @@ You append query options to the URI using the following format,
 
 == Component Options and Configurations
 
-
-
-
 // component options: START
-The Simple JMS2 component supports 18 options, which are listed below.
+The Simple JMS2 component supports 14 options, which are listed below.
 
 
 
@@ -103,31 +89,21 @@ The Simple JMS2 component supports 18 options, which are listed below.
 | *connectionCount* (common) | The maximum number of connections available to endpoints started under this component | 1 | Integer
 | *connectionFactory* (common) | *Autowired* A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource. |  | ConnectionFactory
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
-| *reconnectBackOff* (consumer) | Backoff in millis on consumer pool reconnection attempts | 5000 | long
-| *reconnectOnError* (consumer) | Try to apply reconnection logic on consumer pool | true | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
-| *connectionClientId* (advanced) | The client ID to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
-| *connectionMaxWait* (advanced) | The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. | 5000 | long
-| *connectionResource* (advanced) | A ConnectionResource is an interface that allows for customization and container control of the ConnectionFactory. See Plugable Connection Resource Management for further details. |  | ConnectionResource
-| *connectionTestOnBorrow* (advanced) | When using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource then should each javax.jms.Connection be tested before being used. | true | boolean
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *jmsKeyFormatStrategy* (advanced) | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The default strategy will safely marshal dots and hyphens (. and -). 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  [...]
 | *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
+| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
+| *replyToOnTimeoutMaxConcurrent{zwsp}Consumers* (advanced) | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS. | 1 | int
+| *requestTimeoutCheckerInterval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
-| *connectionPassword* (security) | The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
-| *connectionUsername* (security) | The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
-| *transactionCommitStrategy* (transaction) | To configure which kind of commit strategy to use. Camel provides two implementations out of the box, default and batch. |  | TransactionCommitStrategy
+| *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
+| *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 |===
 // component options: END
 
 
-
-
-
-
-
-
 // endpoint options: START
 The Simple JMS2 endpoint is configured using URI syntax:
 
@@ -148,7 +124,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (43 parameters):
+=== Query Parameters (51 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -157,34 +133,40 @@ with the following path and query parameters:
 | *acknowledgementMode* (common) | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. There are 4 enums and the value can be one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | SessionAcknowledgementType
 | *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message broker [...]
 | *replyTo* (common) | Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer). |  | String
+| *testConnectionOnStartup* (common) | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | boolean
+| *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100% strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transac [...]
+| *autoStartup* (consumer) | Specifies whether the consumer container should auto-startup. | true | boolean
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
-| *consumerCount* (consumer) | Sets the number of consumer listeners used for this endpoint. | 1 | int
+| *concurrentConsumers* (consumer) | Specifies the default number of concurrent consumers when consuming from JMS (not for request/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. When doing request/reply over JMS then the option replyToConcurrentConsumers is used to control number of concurrent consumers on the reply message listener. | 1 | int
 | *durable* (consumer) | Sets topic consumer to durable. | false | boolean
 | *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
-| *reconnectBackOff* (consumer) | Backoff in millis on consumer pool reconnection attempts | 5000 | long
-| *reconnectOnError* (consumer) | Try to apply reconnection logic on consumer pool | true | boolean
 | *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
 | *shared* (consumer) | Sets the consumer to shared. | false | boolean
 | *subscriptionId* (consumer) | Sets the subscription Id, required for durable or shared topics. |  | String
-| *synchronous* (consumer) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | true | boolean
+| *eagerLoadingOfProperties* (consumer) | Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes can catch early any issues with the underlying JMS provider and the use of JMS properties. See also the option eagerPoisonBody. | false | boolean
+| *eagerPoisonBody* (consumer) | If eagerLoadingOfProperties is enabled and the JMS message payload (JMS body or JMS properties) is poison (cannot be read/mapped), then set this text as the message body instead so the message can be processed (the cause of the poison are already stored as exception on the Exchange). This can be turned off by setting eagerPoisonBody=false. See also the option eagerLoadingOfProperties. | Poison JMS message due to ${exception.message} | String
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
 | *messageSelector* (consumer) | Sets the JMS Message selector syntax. |  | String
+| *replyToSameDestinationAllowed* (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
 | *deliveryMode* (producer) | Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2. There are 2 enums and the value can be one of: 1, 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
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
+| *replyToConcurrentConsumers* (producer) | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. | 1 | int
 | *replyToOverride* (producer) | Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination. |  | String
+| *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  [...]
 | *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
 | *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
+| *disableTimeToLive* (producer) | Use this option to force disabling time to live. For example when you do request/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message being sent. The problem is that the sender and receiver systems have to have their clocks synchronized, so they are in sync. This is not always so easy to archive. So you can use disableTimeToLive=true to not set a time to live value on the sent message. Then the message w [...]
+| *includeSentJMSMessageID* (producer) | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination. | false | boolean
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
 | *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
 | *connectionFactory* (advanced) | Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any |  | ConnectionFactory
-| *connectionResource* (advanced) | Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any |  | ConnectionResource
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *exceptionListener* (advanced) | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. |  | ExceptionListener
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
@@ -192,325 +174,112 @@ with the following path and query parameters:
 | *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 [...]
 | *mapJmsMessage* (advanced) | Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc. See section about how mapping works below for more details. | true | boolean
 | *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
+| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
+| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
-| *transactionCommitStrategy* (transaction) | Sets the commit strategy. |  | TransactionCommitStrategy
 | *sharedJMSSession* (transaction) | Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS providers, use jms component to leverage XA transaction. | true | boolean
 |===
 // endpoint options: END
 
 
+Below is an example of how to configure the `SjmsComponent` with its
+required `ConnectionFactory` provider.
 
 
+== Reuse endpoint and send to different destinations computed at runtime
 
+If you need to send messages to a lot of different JMS destinations, it
+makes sense to reuse a SJMS endpoint and specify the real destination in
+a message header. This allows Camel to reuse the same endpoint, but send
+to different destinations. This greatly reduces the number of endpoints
+created and economizes on memory and thread resources.
 
-Below is an example of how to configure the `Sjms2Component` with its
-required `ConnectionFactory` provider. It will create a single connection
-by default and store it using the component's internal pooling APIs to
-ensure that it is able to service Session creation requests in a thread
-safe manner.
-
-[source,java]
-----
-Sjms2Component component = new Sjms2Component();
-component.setConnectionFactory(new ActiveMQConnectionFactory("tcp://localhost:61616"));
-getContext().addComponent("sjms2", component);
-----
-
-For a SJMS2 component that is required to support a durable subscription,
-you can override the default `ConnectionFactoryResource` instance and set
-the `clientId` property.
-
-[source,java]
-----
-ConnectionFactoryResource connectionResource = new ConnectionFactoryResource();
-connectionResource.setConnectionFactory(new ActiveMQConnectionFactory("tcp://localhost:61616"));
-connectionResource.setClientId("myclient-id");
-
-Sjms2Component component = new Sjms2Component();
-component.setConnectionResource(connectionResource);
-component.setMaxConnections(1);
-----
+TIP: Using xref:{eip-vc}:eips:toD-eip.adoc[toD] is easier than specifying the dynamic destination with a header
 
-== Producer Usage
+You can specify the destination in the following headers:
 
-=== InOnly Producer - (Default)
+[width="100%",cols="10%,10%,80%",options="header",]
+|=====================================================================
+|Header |Type |Description
+|`CamelJmsDestinationName` |`String` |The destination name.
+|=====================================================================
 
-The _InOnly_ producer is the default behavior of the SJMS2 Producer
-Endpoint.
+For example, the following route shows how you can compute a destination
+at run time and use it to override the destination appearing in the JMS
+URL:
 
 [source,java]
-----
-from("direct:start")
-    .to("sjms2:queue:bar");
-----
-
-=== InOut Producer
-
-To enable _InOut_ behavior append the `exchangePattern` attribute to the
-URI. By default it will use a dedicated TemporaryQueue for each
-consumer.
-
-[source,java]
-----
-from("direct:start")
-    .to("sjms2:queue:bar?exchangePattern=InOut");
-----
-
-You can specify a `replyTo` though which can provide a better
-monitor point.
-
-[source,java]
-----
-from("direct:start")
-    .to("sjms2:queue:bar?replyTo=my.reply.to.queue");
-----
+--------------------------------
+from("file://inbox")
+  .to("bean:computeDestination")
+  .to("sjms2:queue:dummy");
+--------------------------------
 
-== Consumer Usage
+The queue name, `dummy`, is just a placeholder. It must be provided as
+part of the JMS endpoint URL, but it will be ignored in this example.
 
-=== Durable Shared Subscription
-
-To create a durable subscription that can be shared between one or more consumers.
-Use a JMS 2.0 compliant connection factory and specify a common subscriptionId. Then set the subscription properties durable and shared to true.
-
-[source,java]
-----
-from("sjms2:topic:foo?consumerCount=3&subscriptionId=bar&durable=true&shared=true")
-    .to("mock:result");
-
-from("sjms2:topic:foo?consumerCount=2&subscriptionId=bar&durable=true&shared=true")
-    .to("mock:result");
-----
-
-=== InOnly Consumer - (Default)
-
-The _InOnly_ xonsumer is the default Exchange behavior of the SJMS2
-Consumer Endpoint.
+In the `computeDestination` bean, specify the real destination by
+setting the `CamelJmsDestinationName` header as follows:
 
 [source,java]
-----
-from("sjms2:queue:bar")
-    .to("mock:result");
-----
-
-=== InOut Consumer
-
-To enable _InOut_ behavior append the `exchangePattern` attribute to the
-URI.
-
-[source,java]
-----
-from("sjms2:queue:in.out.test?exchangePattern=InOut")
-    .transform(constant("Bye Camel"));
-----
-
-== Advanced Usage Notes
-
-=== Plugable Connection Resource Management [[SJMS2-connectionresource]]
-
-SJMS2 provides JMS
-http://docs.oracle.com/javaee/5/api/javax/jms/Connection.html[`Connection`]
-resource management through built-in connection pooling. This eliminates
-the need to depend on third party API pooling logic. However there may
-be times that you are required to use an external Connection resource
-manager such as those provided by J2EE or OSGi containers. For this SJMS2
-provides an interface that can be used to override the internal SJMS2
-Connection pooling capabilities. This is accomplished through the
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionResource.java[`ConnectionResource`]
-interface.
-
-The
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionResource.java[`ConnectionResource`]
-provides methods for borrowing and returning Connections as needed is
-the contract used to provide
-http://docs.oracle.com/javaee/5/api/javax/jms/Connection.html[`Connection`]
-pools to the SJMS2 component. A user should use when it is necessary to
-integrate SJMS2 with an external connection pooling manager.
-
-It is recommended though that for standard
-http://docs.oracle.com/javaee/5/api/javax/jms/ConnectionFactory.html[`ConnectionFactory`]
-providers you use the
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java[`ConnectionFactoryResource`]
-implementation that is provided with SJMS2 as-is or extend as it is
-optimized for this component.
-
-Below is an example of using the plugable ConnectionResource with the
-ActiveMQ `PooledConnectionFactory`:
-
-[source,java]
-----
-public class AMQConnectionResource implements ConnectionResource {
-    private PooledConnectionFactory pcf;
-
-    public AMQConnectionResource(String connectString, int maxConnections) {
-        super();
-        pcf = new PooledConnectionFactory(connectString);
-        pcf.setMaxConnections(maxConnections);
-        pcf.start();
-    }
-
-    public void stop() {
-        pcf.stop();
-    }
-
-    @Override
-    public Connection borrowConnection() throws Exception {
-        Connection answer = pcf.createConnection();
-        answer.start();
-        return answer;
-    }
-
-    @Override
-    public Connection borrowConnection(long timeout) throws Exception {
-        // SNIPPED...
-    }
-
-    @Override
-    public void returnConnection(Connection connection) throws Exception {
-        // Do nothing since there isn't a way to return a Connection
-        // to the instance of PooledConnectionFactory
-        log.info("Connection returned");
-    }
+-------------------------------------------------------------------------
+public void setJmsHeader(Exchange exchange) {
+   String id = ....
+   exchange.getIn().setHeader("CamelJmsDestinationName", "order:" + id");
 }
-----
-
-Then pass in the `ConnectionResource` to the `Sjms2Component`:
-
-[source,java]
-----
-CamelContext camelContext = new DefaultCamelContext();
-AMQConnectionResource pool = new AMQConnectionResource("tcp://localhost:33333", 1);
-Sjms2Component component = new Sjms2Component();
-component.setConnectionResource(pool);
-camelContext.addComponent("sjms2", component);
-----
-
-To see the full example of its usage please refer to the
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java[`ConnectionResourceIT`].
-
-=== Session, Consumer, & Producer Pooling & Caching Management
-
-Coming soon ...
-
-=== Batch Message Support
+-------------------------------------------------------------------------
 
-The Sjms2Producer supports publishing a collection of messages by
-creating an Exchange that encapsulates a `List`. This Sjms2Producer will
-take then iterate through the contents of the List and publish each
-message individually.
+Then Camel will read this header and use it as the destination instead
+of the one configured on the endpoint. So, in this example Camel sends
+the message to `sjms2:queue:order:2`, assuming the `id` value was 2.
 
-If when producing a batch of messages there is the need to set headers
-that are unique to each message you can use the SJMS2
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java[`BatchMessage`]
-class. When the Sjms2Producer encounters a `BatchMessage` list it will
-iterate each `BatchMessage` and publish the included payload and headers.
+Keep in mind that the JMS producer removes both `CamelJmsDestinationName`
+headers from the exchange and do not propagate  them to the created JMS
+message in order to avoid the accidental loops
+in the routes (in scenarios when the message will be forwarded to the
+another JMS endpoint).
 
-Below is an example of using the BatchMessage class. First we create a
-list of `BatchMessage`:
+== Using toD
 
-[source,java]
-----
-List<BatchMessage<String>> messages = new ArrayList<BatchMessage<String>>();
-for (int i = 1; i <= messageCount; i++) {
-    String body = "Hello World " + i;
-    BatchMessage<String> message = new BatchMessage<String>(body, null);
-    messages.add(message);
-}
-----
+If you need to send messages to a lot of different JMS destinations, it
+makes sense to reuse a SJMS2 endpoint and specify the dynamic destinations
+with simple language using xref:{eip-vc}:eips:toD-eip.adoc[toD].
 
-Then publish the list:
+For example suppose you need to send messages to queues with order types,
+then using toD could for example be done as follows:
 
 [source,java]
-----
-template.sendBody("sjms2:queue:batch.queue", messages);
-----
+--------------------------------
+from("direct:order")
+  .toD("sjms2:order-${header.orderType}");
+--------------------------------
 
-=== Customizable Transaction Commit Strategies (Local JMS Transactions only)
-
-SJMS2 provides a developer the means to create a custom and plugable
-transaction strategy through the use of the
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionCommitStrategy.java[`TransactionCommitStrategy`]
-interface. This allows a user to define a unique set of circumstances
-that the
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java[`SessionTransactionSynchronization`]
-will use to determine when to commit the Session. An example of its use
-is the
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java[`BatchTransactionCommitStrategy`]
-which is detailed further in the next section.
-
-=== Transacted Batch Consumers & Producers
-
-The SJMS2 component has been designed to support the batching of local JMS
-transactions on both the Producer and Consumer endpoints. How they are
-handled on each is very different though.
-
-The SJMS2 consumer endpoint is a straightforward implementation that will
-process X messages before committing them with the associated Session.
-To enable batched transaction on the consumer first enable transactions
-by setting the `transacted` parameter to true and then adding the
-`transactionBatchCount` and setting it to any value that is greater than
-0. For example the following configuration will commit the Session every
-10 messages:
-
-[source]
-----
-sjms2:queue:transacted.batch.consumer?transacted=true&transactionBatchCount=10
-----
-
-If an exception occurs during the processing of a batch on the consumer
-endpoint, the Session rollback is invoked causing the messages to be
-redelivered to the next available consumer. The counter is also reset to
-0 for the `BatchTransactionCommitStrategy` for the associated Session as
-well. It is the responsibility of the user to ensure they put hooks in
-their processors of batch messages to watch for messages with the
-JMSRedelivered header set to true. This is the indicator that messages
-were rolled back at some point and that a verification of a successful
-processing should occur.
-
-A transacted batch consumer also carries with it an instance of an
-internal timer that waits a default amount of time (5000ms) between
-messages before committing the open transactions on the Session. The
-default value of 5000ms (minimum of 1000ms) should be adequate for most
-use-cases but if further tuning is necessary simply set the
-`transactionBatchTimeout` parameter.
-
-[source]
-----
-sjms2:queue:transacted.batch.consumer?transacted=true&transactionBatchCount=10&transactionBatchTimeout=2000
-----
+== Additional Notes
 
-The minimal value that will be accepted is 1000ms as the amount of
-context switching may cause unnecessary performance impacts without
-gaining benefit.
+=== Local transactions
 
-The producer endpoint is handled much differently though. With the
-producer after each message is delivered to its destination the Exchange
-is closed and there is no longer a reference to that message. To make a
-available all the messages available for redelivery you simply enable
-transactions on a Producer Endpoint that is publishing BatchMessages.
-The transaction will commit at the conclusion of the exchange which
-includes all messages in the batch list. Nothing additional need be
-configured. For example:
+When using `transacted=true` then JMS Transacted Acknowledge Mode are in use.
+The SJMS2 component supports this from both the consumer and producers. If a consumer
+is transacted, then the active JMS Session will commit or rollback at the end of processing the message.
 
-[source,java]
-----
-List<BatchMessage<String>> messages = new ArrayList<BatchMessage<String>>();
-for (int i = 1; i <= messageCount; i++) {
-    String body = "Hello World " + i;
-    BatchMessage<String> message = new BatchMessage<String>(body, null);
-    messages.add(message);
-}
-----
+SJMS2 producers that are `transacted=true` will also defer until the end of processing the message
+before the the active JMS Session will commit or rollback.
 
-Now publish the List with transactions enabled:
+You can combine consumer and producer, such as:
 
 [source,java]
 ----
-template.sendBody("sjms2:queue:batch.queue?transacted=true", messages);
+from("sjms2:cheese?transacted=true")
+  .to("bean:foo")
+  .to("sjms2:foo?transacted=true")
+  .to("bean:bar");
 ----
 
-== Additional Notes
+Here the consumer and producer are both transacted, which means that only at the end of processing the message,
+then both the consumer and the producer will commit (or rollback in case of an exception during routing).
 
 === Message Header Format
 
@@ -530,12 +299,8 @@ messages:
 ** is replaced by _DOT_ and the reverse replacement when Camel consumes
 the message.
 ** is replaced by _HYPHEN_ and the reverse replacement when Camel
-consumes the message. +
-See also the option `jmsKeyFormatStrategy`, which allows use of your own
-custom strategy for formatting keys.
-
-For the `exchange.in.header`, the following rules apply for the header
-values:
+consumes the message.See also the option `jmsKeyFormatStrategy`,
+which allows use of your own custom strategy for formatting keys.
 
 === Message Content
 
@@ -550,40 +315,19 @@ dropped.
 === Clustering
 
 When using _InOut_ with SJMS2 in a clustered environment you must either
-use TemporaryQueue destinations or use a unique named reply to
+use TemporaryQueue destinations or use a unique reply to
 destination per InOut producer endpoint. Message correlation is handled
-by the endpoint, not with message selectors at the broker. The InOut
-Producer Endpoint uses Java Concurrency Exchangers cached by the Message
-`JMSCorrelationID`. This provides a nice performance increase while
-reducing the overhead on the broker since all the messages are consumed
-from the destination in the order they are produced by the interested
-consumer.
+by the producer, not with message selectors at the broker.
+
+[NOTE]
+====
+You should only use queues as reply-to destination types, topics is not recommended or fully supported.
+====
 
 Currently the only correlation strategy is to use the `JMSCorrelationId`.
 The _InOut_ Consumer uses this strategy as well ensuring that all
 responses messages to the included `JMSReplyTo` destination also have the
 `JMSCorrelationId` copied from the request as well.
 
-== Transaction Support [[SJMS2-transactions]]
-
-SJMS2 currently only supports the use of internal JMS Transactions. There
-is no support for the Camel Transaction Processor or the Java
-Transaction API (JTA).
-
-=== Does Springless Mean I Can't Use Spring?
-
-Not at all. Below is an example of the SJMS2 component using the XML DSL:
-
-[source,xml]
-----
-<route>
-    <from uri="direct:invoke.named.reply.to.queue" />
-    <to uri="sjms2:queue:named.reply.to.queue?replyTo=my.response.queue" />
-</route>
-----
-
-Springless refers to moving away from the dependency on the Spring JMS
-API. A new JMS client API is being developed from the ground up to power
-SJMS2.
 
 include::camel-spring-boot::page$sjms2-starter.adoc[]
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index d121fcf..e0eafc3 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -32,11 +32,6 @@
     <description>A pure Java JMS Camel Component</description>
 
     <properties>
-        <camel.osgi.private.pkg>
-            org.apache.camel.component.sjms.consumer,
-            org.apache.camel.component.sjms.producer,
-            org.apache.camel.component.sjms.tx
-        </camel.osgi.private.pkg>
         <camel.osgi.import>
             javax.jms;version="[1.1,3)",
             *
@@ -44,17 +39,12 @@
     </properties>
 
     <dependencies>
+
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-support</artifactId>
         </dependency>
 
-        <!-- TODO: remove our own pooling -->
-        <dependency>
-            <groupId>commons-pool</groupId>
-            <artifactId>commons-pool</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java
index 505241f..566e482 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsComponentConfigurer.java
@@ -25,22 +25,10 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
-        case "connectionclientid":
-        case "connectionClientId": target.setConnectionClientId(property(camelContext, java.lang.String.class, value)); return true;
         case "connectioncount":
         case "connectionCount": target.setConnectionCount(property(camelContext, java.lang.Integer.class, value)); return true;
         case "connectionfactory":
         case "connectionFactory": target.setConnectionFactory(property(camelContext, javax.jms.ConnectionFactory.class, value)); return true;
-        case "connectionmaxwait":
-        case "connectionMaxWait": target.setConnectionMaxWait(property(camelContext, long.class, value)); return true;
-        case "connectionpassword":
-        case "connectionPassword": target.setConnectionPassword(property(camelContext, java.lang.String.class, value)); return true;
-        case "connectionresource":
-        case "connectionResource": target.setConnectionResource(property(camelContext, org.apache.camel.component.sjms.jms.ConnectionResource.class, value)); return true;
-        case "connectiontestonborrow":
-        case "connectionTestOnBorrow": target.setConnectionTestOnBorrow(property(camelContext, boolean.class, value)); return true;
-        case "connectionusername":
-        case "connectionUsername": target.setConnectionUsername(property(camelContext, java.lang.String.class, value)); return true;
         case "destinationcreationstrategy":
         case "destinationCreationStrategy": target.setDestinationCreationStrategy(property(camelContext, org.apache.camel.component.sjms.jms.DestinationCreationStrategy.class, value)); return true;
         case "headerfilterstrategy":
@@ -51,10 +39,14 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
         case "messagecreatedstrategy":
         case "messageCreatedStrategy": target.setMessageCreatedStrategy(property(camelContext, org.apache.camel.component.sjms.jms.MessageCreatedStrategy.class, value)); return true;
+        case "password": target.setPassword(property(camelContext, java.lang.String.class, value)); return true;
         case "recoveryinterval":
         case "recoveryInterval": target.setRecoveryInterval(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
-        case "transactioncommitstrategy":
-        case "transactionCommitStrategy": target.setTransactionCommitStrategy(property(camelContext, org.apache.camel.component.sjms.TransactionCommitStrategy.class, value)); return true;
+        case "replytoontimeoutmaxconcurrentconsumers":
+        case "replyToOnTimeoutMaxConcurrentConsumers": target.setReplyToOnTimeoutMaxConcurrentConsumers(property(camelContext, int.class, value)); return true;
+        case "requesttimeoutcheckerinterval":
+        case "requestTimeoutCheckerInterval": target.setRequestTimeoutCheckerInterval(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
+        case "username": target.setUsername(property(camelContext, java.lang.String.class, value)); return true;
         default: return false;
         }
     }
@@ -71,22 +63,10 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "autowiredEnabled": return boolean.class;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return boolean.class;
-        case "connectionclientid":
-        case "connectionClientId": return java.lang.String.class;
         case "connectioncount":
         case "connectionCount": return java.lang.Integer.class;
         case "connectionfactory":
         case "connectionFactory": return javax.jms.ConnectionFactory.class;
-        case "connectionmaxwait":
-        case "connectionMaxWait": return long.class;
-        case "connectionpassword":
-        case "connectionPassword": return java.lang.String.class;
-        case "connectionresource":
-        case "connectionResource": return org.apache.camel.component.sjms.jms.ConnectionResource.class;
-        case "connectiontestonborrow":
-        case "connectionTestOnBorrow": return boolean.class;
-        case "connectionusername":
-        case "connectionUsername": return java.lang.String.class;
         case "destinationcreationstrategy":
         case "destinationCreationStrategy": return org.apache.camel.component.sjms.jms.DestinationCreationStrategy.class;
         case "headerfilterstrategy":
@@ -97,10 +77,14 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "lazyStartProducer": return boolean.class;
         case "messagecreatedstrategy":
         case "messageCreatedStrategy": return org.apache.camel.component.sjms.jms.MessageCreatedStrategy.class;
+        case "password": return java.lang.String.class;
         case "recoveryinterval":
         case "recoveryInterval": return long.class;
-        case "transactioncommitstrategy":
-        case "transactionCommitStrategy": return org.apache.camel.component.sjms.TransactionCommitStrategy.class;
+        case "replytoontimeoutmaxconcurrentconsumers":
+        case "replyToOnTimeoutMaxConcurrentConsumers": return int.class;
+        case "requesttimeoutcheckerinterval":
+        case "requestTimeoutCheckerInterval": return long.class;
+        case "username": return java.lang.String.class;
         default: return null;
         }
     }
@@ -113,22 +97,10 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "autowiredEnabled": return target.isAutowiredEnabled();
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return target.isBridgeErrorHandler();
-        case "connectionclientid":
-        case "connectionClientId": return target.getConnectionClientId();
         case "connectioncount":
         case "connectionCount": return target.getConnectionCount();
         case "connectionfactory":
         case "connectionFactory": return target.getConnectionFactory();
-        case "connectionmaxwait":
-        case "connectionMaxWait": return target.getConnectionMaxWait();
-        case "connectionpassword":
-        case "connectionPassword": return target.getConnectionPassword();
-        case "connectionresource":
-        case "connectionResource": return target.getConnectionResource();
-        case "connectiontestonborrow":
-        case "connectionTestOnBorrow": return target.isConnectionTestOnBorrow();
-        case "connectionusername":
-        case "connectionUsername": return target.getConnectionUsername();
         case "destinationcreationstrategy":
         case "destinationCreationStrategy": return target.getDestinationCreationStrategy();
         case "headerfilterstrategy":
@@ -139,10 +111,14 @@ public class SjmsComponentConfigurer extends PropertyConfigurerSupport implement
         case "lazyStartProducer": return target.isLazyStartProducer();
         case "messagecreatedstrategy":
         case "messageCreatedStrategy": return target.getMessageCreatedStrategy();
+        case "password": return target.getPassword();
         case "recoveryinterval":
         case "recoveryInterval": return target.getRecoveryInterval();
-        case "transactioncommitstrategy":
-        case "transactionCommitStrategy": return target.getTransactionCommitStrategy();
+        case "replytoontimeoutmaxconcurrentconsumers":
+        case "replyToOnTimeoutMaxConcurrentConsumers": return target.getReplyToOnTimeoutMaxConcurrentConsumers();
+        case "requesttimeoutcheckerinterval":
+        case "requestTimeoutCheckerInterval": return target.getRequestTimeoutCheckerInterval();
+        case "username": return target.getUsername();
         default: return null;
         }
     }
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java
index 7fd6f8c..9487e58 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointConfigurer.java
@@ -35,14 +35,12 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "autoStartup": target.setAutoStartup(property(camelContext, boolean.class, value)); return true;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
+        case "concurrentconsumers":
+        case "concurrentConsumers": target.setConcurrentConsumers(property(camelContext, int.class, value)); return true;
         case "connectioncount":
         case "connectionCount": target.setConnectionCount(property(camelContext, java.lang.Integer.class, value)); return true;
         case "connectionfactory":
         case "connectionFactory": target.setConnectionFactory(property(camelContext, javax.jms.ConnectionFactory.class, value)); return true;
-        case "connectionresource":
-        case "connectionResource": target.setConnectionResource(property(camelContext, org.apache.camel.component.sjms.jms.ConnectionResource.class, value)); return true;
-        case "consumercount":
-        case "consumerCount": target.setConsumerCount(property(camelContext, int.class, value)); return true;
         case "deliverymode":
         case "deliveryMode": target.setDeliveryMode(property(camelContext, java.lang.Integer.class, value)); return true;
         case "deliverypersistent":
@@ -75,6 +73,8 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "headerFilterStrategy": target.setHeaderFilterStrategy(property(camelContext, org.apache.camel.spi.HeaderFilterStrategy.class, value)); return true;
         case "includealljmsxproperties":
         case "includeAllJMSXProperties": target.setIncludeAllJMSXProperties(property(camelContext, boolean.class, value)); return true;
+        case "includesentjmsmessageid":
+        case "includeSentJMSMessageID": target.setIncludeSentJMSMessageID(property(camelContext, boolean.class, value)); return true;
         case "jmskeyformatstrategy":
         case "jmsKeyFormatStrategy": target.setJmsKeyFormatStrategy(property(camelContext, org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy.class, value)); return true;
         case "lazystartproducer":
@@ -92,12 +92,16 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "recoveryInterval": target.setRecoveryInterval(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
         case "replyto":
         case "replyTo": target.setReplyTo(property(camelContext, java.lang.String.class, value)); return true;
+        case "replytoconcurrentconsumers":
+        case "replyToConcurrentConsumers": target.setReplyToConcurrentConsumers(property(camelContext, int.class, value)); return true;
         case "replytodeliverypersistent":
         case "replyToDeliveryPersistent": target.setReplyToDeliveryPersistent(property(camelContext, boolean.class, value)); return true;
         case "replytooverride":
         case "replyToOverride": target.setReplyToOverride(property(camelContext, java.lang.String.class, value)); return true;
         case "replytosamedestinationallowed":
         case "replyToSameDestinationAllowed": target.setReplyToSameDestinationAllowed(property(camelContext, boolean.class, value)); return true;
+        case "replytotype":
+        case "replyToType": target.setReplyToType(property(camelContext, org.apache.camel.component.sjms.ReplyToType.class, value)); return true;
         case "requesttimeout":
         case "requestTimeout": target.setRequestTimeout(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
         case "sharedjmssession":
@@ -108,8 +112,6 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "timetolive":
         case "timeToLive": target.setTimeToLive(property(camelContext, long.class, value)); return true;
         case "transacted": target.setTransacted(property(camelContext, boolean.class, value)); return true;
-        case "transactioncommitstrategy":
-        case "transactionCommitStrategy": target.setTransactionCommitStrategy(property(camelContext, org.apache.camel.component.sjms.TransactionCommitStrategy.class, value)); return true;
         case "transferexception":
         case "transferException": target.setTransferException(property(camelContext, boolean.class, value)); return true;
         default: return false;
@@ -133,14 +135,12 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "autoStartup": return boolean.class;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return boolean.class;
+        case "concurrentconsumers":
+        case "concurrentConsumers": return int.class;
         case "connectioncount":
         case "connectionCount": return java.lang.Integer.class;
         case "connectionfactory":
         case "connectionFactory": return javax.jms.ConnectionFactory.class;
-        case "connectionresource":
-        case "connectionResource": return org.apache.camel.component.sjms.jms.ConnectionResource.class;
-        case "consumercount":
-        case "consumerCount": return int.class;
         case "deliverymode":
         case "deliveryMode": return java.lang.Integer.class;
         case "deliverypersistent":
@@ -173,6 +173,8 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "headerFilterStrategy": return org.apache.camel.spi.HeaderFilterStrategy.class;
         case "includealljmsxproperties":
         case "includeAllJMSXProperties": return boolean.class;
+        case "includesentjmsmessageid":
+        case "includeSentJMSMessageID": return boolean.class;
         case "jmskeyformatstrategy":
         case "jmsKeyFormatStrategy": return org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy.class;
         case "lazystartproducer":
@@ -190,12 +192,16 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "recoveryInterval": return long.class;
         case "replyto":
         case "replyTo": return java.lang.String.class;
+        case "replytoconcurrentconsumers":
+        case "replyToConcurrentConsumers": return int.class;
         case "replytodeliverypersistent":
         case "replyToDeliveryPersistent": return boolean.class;
         case "replytooverride":
         case "replyToOverride": return java.lang.String.class;
         case "replytosamedestinationallowed":
         case "replyToSameDestinationAllowed": return boolean.class;
+        case "replytotype":
+        case "replyToType": return org.apache.camel.component.sjms.ReplyToType.class;
         case "requesttimeout":
         case "requestTimeout": return long.class;
         case "sharedjmssession":
@@ -206,8 +212,6 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "timetolive":
         case "timeToLive": return long.class;
         case "transacted": return boolean.class;
-        case "transactioncommitstrategy":
-        case "transactionCommitStrategy": return org.apache.camel.component.sjms.TransactionCommitStrategy.class;
         case "transferexception":
         case "transferException": return boolean.class;
         default: return null;
@@ -232,14 +236,12 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "autoStartup": return target.isAutoStartup();
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return target.isBridgeErrorHandler();
+        case "concurrentconsumers":
+        case "concurrentConsumers": return target.getConcurrentConsumers();
         case "connectioncount":
         case "connectionCount": return target.getConnectionCount();
         case "connectionfactory":
         case "connectionFactory": return target.getConnectionFactory();
-        case "connectionresource":
-        case "connectionResource": return target.getConnectionResource();
-        case "consumercount":
-        case "consumerCount": return target.getConsumerCount();
         case "deliverymode":
         case "deliveryMode": return target.getDeliveryMode();
         case "deliverypersistent":
@@ -272,6 +274,8 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "headerFilterStrategy": return target.getHeaderFilterStrategy();
         case "includealljmsxproperties":
         case "includeAllJMSXProperties": return target.isIncludeAllJMSXProperties();
+        case "includesentjmsmessageid":
+        case "includeSentJMSMessageID": return target.isIncludeSentJMSMessageID();
         case "jmskeyformatstrategy":
         case "jmsKeyFormatStrategy": return target.getJmsKeyFormatStrategy();
         case "lazystartproducer":
@@ -289,12 +293,16 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "recoveryInterval": return target.getRecoveryInterval();
         case "replyto":
         case "replyTo": return target.getReplyTo();
+        case "replytoconcurrentconsumers":
+        case "replyToConcurrentConsumers": return target.getReplyToConcurrentConsumers();
         case "replytodeliverypersistent":
         case "replyToDeliveryPersistent": return target.isReplyToDeliveryPersistent();
         case "replytooverride":
         case "replyToOverride": return target.getReplyToOverride();
         case "replytosamedestinationallowed":
         case "replyToSameDestinationAllowed": return target.isReplyToSameDestinationAllowed();
+        case "replytotype":
+        case "replyToType": return target.getReplyToType();
         case "requesttimeout":
         case "requestTimeout": return target.getRequestTimeout();
         case "sharedjmssession":
@@ -305,8 +313,6 @@ public class SjmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "timetolive":
         case "timeToLive": return target.getTimeToLive();
         case "transacted": return target.isTransacted();
-        case "transactioncommitstrategy":
-        case "transactionCommitStrategy": return target.getTransactionCommitStrategy();
         case "transferexception":
         case "transferException": return target.isTransferException();
         default: return null;
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java
index d84eb11..717a7ff 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java
@@ -20,7 +20,8 @@ public class SjmsEndpointUriFactory extends org.apache.camel.support.component.E
     private static final Set<String> PROPERTY_NAMES;
     private static final Set<String> SECRET_PROPERTY_NAMES;
     static {
-        Set<String> props = new HashSet<>(49);
+        Set<String> props = new HashSet<>(50);
+        props.add("includeSentJMSMessageID");
         props.add("asyncConsumer");
         props.add("mapJmsMessage");
         props.add("synchronous");
@@ -35,21 +36,21 @@ public class SjmsEndpointUriFactory extends org.apache.camel.support.component.E
         props.add("destinationType");
         props.add("asyncStartListener");
         props.add("eagerPoisonBody");
+        props.add("replyToConcurrentConsumers");
         props.add("destinationCreationStrategy");
         props.add("disableTimeToLive");
         props.add("messageSelector");
         props.add("deliveryPersistent");
         props.add("priority");
+        props.add("concurrentConsumers");
         props.add("acknowledgementMode");
         props.add("lazyStartProducer");
-        props.add("transactionCommitStrategy");
         props.add("replyTo");
         props.add("replyToOverride");
         props.add("errorHandlerLoggingLevel");
         props.add("durableSubscriptionId");
         props.add("exceptionHandler");
         props.add("connectionCount");
-        props.add("connectionResource");
         props.add("explicitQosEnabled");
         props.add("transacted");
         props.add("autoStartup");
@@ -62,10 +63,10 @@ public class SjmsEndpointUriFactory extends org.apache.camel.support.component.E
         props.add("allowNullBody");
         props.add("replyToDeliveryPersistent");
         props.add("disableReplyTo");
-        props.add("consumerCount");
         props.add("recoveryInterval");
         props.add("exchangePattern");
         props.add("preserveMessageQos");
+        props.add("replyToType");
         props.add("testConnectionOnStartup");
         props.add("connectionFactory");
         props.add("replyToSameDestinationAllowed");
diff --git a/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json b/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json
index 040eaa9..9e065f0 100644
--- a/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json
+++ b/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/sjms.json
@@ -27,18 +27,15 @@
     "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
     "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
-    "connectionClientId": { "kind": "property", "displayName": "Connection Client Id", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The client ID to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "connectionMaxWait": { "kind": "property", "displayName": "Connection Max Wait", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 5000, "description": "The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "connectionResource": { "kind": "property", "displayName": "Connection Resource", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.ConnectionResource", "deprecated": false, "autowired": false, "secret": false, "description": "A ConnectionResource is an interface that allows for customization and container control of the ConnectionFactory. See Plugable Connection Resource Management for further details." },
-    "connectionTestOnBorrow": { "kind": "property", "displayName": "Connection Test On Borrow", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource then should each javax.jms.Connection be tested before being used." },
     "destinationCreationStrategy": { "kind": "property", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
     "jmsKeyFormatStrategy": { "kind": "property", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The defau [...]
     "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
     "recoveryInterval": { "kind": "property", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
+    "replyToOnTimeoutMaxConcurrentConsumers": { "kind": "property", "displayName": "Reply To On Timeout Max Concurrent Consumers", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request\/reply over JMS." },
+    "requestTimeoutCheckerInterval": { "kind": "property", "displayName": "Request Timeout Checker Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Configures how often Camel should check for timed out Exchanges when doing request\/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeou [...]
     "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
-    "connectionPassword": { "kind": "property", "displayName": "Connection Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "connectionUsername": { "kind": "property", "displayName": "Connection Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "transactionCommitStrategy": { "kind": "property", "displayName": "Transaction Commit Strategy", "group": "transaction", "label": "transaction", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.TransactionCommitStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To configure which kind of commit strategy to use. Camel provides two implementations out of the box, default and batch." }
+    "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
+    "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }
   },
   "properties": {
     "destinationType": { "kind": "path", "displayName": "Destination Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "queue", "topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "queue", "description": "The kind of destination to use" },
@@ -50,7 +47,7 @@
     "asyncConsumer": { "kind": "parameter", "displayName": "Async Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asy [...]
     "autoStartup": { "kind": "parameter", "displayName": "Auto Startup", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether the consumer container should auto-startup." },
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
-    "consumerCount": { "kind": "parameter", "displayName": "Consumer Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Sets the number of consumer listeners used for this endpoint." },
+    "concurrentConsumers": { "kind": "parameter", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the default number of concurrent consumers when consuming from JMS (not for request\/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up\/down of threads. When doing r [...]
     "durableSubscriptionId": { "kind": "parameter", "displayName": "Durable Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the durable subscription Id required for durable topics." },
     "replyToDeliveryPersistent": { "kind": "parameter", "displayName": "Reply To Delivery Persistent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to use persistent delivery by default for replies." },
     "eagerLoadingOfProperties": { "kind": "parameter", "displayName": "Eager Loading Of Properties", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes c [...]
@@ -65,16 +62,18 @@
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
     "preserveMessageQos": { "kind": "parameter", "displayName": "Preserve Message Qos", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDelive [...]
     "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "description": "Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in orde [...]
+    "replyToConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the default number of concurrent consumers when doing request\/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up\/down of threads." },
     "replyToOverride": { "kind": "parameter", "displayName": "Reply To Override", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination." },
+    "replyToType": { "kind": "parameter", "displayName": "Reply To Type", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.ReplyToType", "enum": [ "Temporary", "Exclusive" ], "deprecated": false, "autowired": false, "secret": false, "description": "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 Exclusi [...]
     "requestTimeout": { "kind": "parameter", "displayName": "Request Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "20000", "description": "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 timeou [...]
     "timeToLive": { "kind": "parameter", "displayName": "Time To Live", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "description": "When sending messages, specifies the time-to-live of the message (in milliseconds)." },
     "allowNullBody": { "kind": "parameter", "displayName": "Allow Null Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an JMSException is thrown." },
     "disableTimeToLive": { "kind": "parameter", "displayName": "Disable Time To Live", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Use this option to force disabling time to live. For example when you do request\/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message  [...]
+    "includeSentJMSMessageID": { "kind": "parameter", "displayName": "Include Sent JMSMessage ID", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was  [...]
     "asyncStartListener": { "kind": "parameter", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/o [...]
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to stop the consumer message listener asynchronously, when stopping a route." },
     "connectionCount": { "kind": "parameter", "displayName": "Connection Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "description": "The maximum number of connections available to this endpoint" },
     "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any" },
-    "connectionResource": { "kind": "parameter", "displayName": "Connection Resource", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.ConnectionResource", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any" },
     "destinationCreationStrategy": { "kind": "parameter", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
     "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
@@ -88,7 +87,6 @@
     "errorHandlerLoggingLevel": { "kind": "parameter", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "description": "Allows to configure the default errorHandler logging level for logging uncaught exceptions." },
     "errorHandlerLogStackTrace": { "kind": "parameter", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Allows to control whether stacktraces should be logged or not, by the default errorHandler." },
     "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to use transacted mode" },
-    "transactionCommitStrategy": { "kind": "parameter", "displayName": "Transaction Commit Strategy", "group": "transaction", "label": "transaction", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.TransactionCommitStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the commit strategy." },
     "sharedJMSSession": { "kind": "parameter", "displayName": "Shared JMSSession", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS provi [...]
   }
 }
diff --git a/components/camel-sjms/src/main/docs/sjms-component.adoc b/components/camel-sjms/src/main/docs/sjms-component.adoc
index cdabfaa..eaf6c55 100644
--- a/components/camel-sjms/src/main/docs/sjms-component.adoc
+++ b/components/camel-sjms/src/main/docs/sjms-component.adoc
@@ -12,33 +12,22 @@ include::{cq-version}@camel-quarkus:ROOT:partial$reference/components/sjms.adoc[
 
 *{component-header}*
 
-The Simple JMS Component, or SJMS, is a JMS client for use with Camel
-that uses well known best practices when it comes to JMS client creation
-and configuration. SJMS contains a brand new JMS client API written
-explicitly for Camel eliminating third party messaging implementations
-keeping it light and resilient. The following features is included:
+The Simple JMS Component is a JMS component that only uses JMS APIs
+and no 3rd-party framework such as Spring JMS.
 
-// TODO: Update this after refactor
+The component was reworked from Camel 3.8 onwards
+to be similar to the existing Camel JMS component that is based on Spring JMS.
 
-* Standard Queue and Topic Support (Durable & Non-Durable)
-* InOnly & InOut MEP Support
-* Asynchronous Producer and Consumer Processing
-* Internal JMS Transaction Support
+The reason is to offer many of the same features and functionality from the JMS component,
+but for users that requires lightweight without having to include the Spring Framework.
 
-Additional key features include:
+There are some advanced features in the Spring JMS component that has been omitted, such as
+shared queues for request/reply. Spring JMS offers fine grained tunings for concurrency settings,
+which can be tweaked for dynamic scaling up and down depending on load. This is a special feature in Spring JMS
+that would require substantial code to implement in SJMS.
 
-* Plugable Connection Resource Management
-* Session, Consumer, & Producer Pooling & Caching Management
-* Support for Customizable Transaction Commit Strategies (Local JMS
-Transactions only)
-
-[NOTE]
-====
-*Why the S in SJMS*
-
-S stands for Simple and Standard and Springless. Also camel-jms was
-already taken.
-====
+The SJMS component does not support for Spring or JTA Transaction, however support for internal local transactions
+is supported using JMS or Transaction or Client Acknowledge Mode. See more further below.
 
 Maven users will need to add the following dependency to their `pom.xml`
 for this component:
@@ -90,7 +79,7 @@ You append query options to the URI using the following format,
 == Component Options and Configurations
 
 // component options: START
-The Simple JMS component supports 17 options, which are listed below.
+The Simple JMS component supports 14 options, which are listed below.
 
 
 
@@ -102,18 +91,15 @@ The Simple JMS component supports 17 options, which are listed below.
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
-| *connectionClientId* (advanced) | The client ID to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
-| *connectionMaxWait* (advanced) | The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. | 5000 | long
-| *connectionResource* (advanced) | A ConnectionResource is an interface that allows for customization and container control of the ConnectionFactory. See Plugable Connection Resource Management for further details. |  | ConnectionResource
-| *connectionTestOnBorrow* (advanced) | When using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource then should each javax.jms.Connection be tested before being used. | true | boolean
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *jmsKeyFormatStrategy* (advanced) | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The default strategy will safely marshal dots and hyphens (. and -). 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  [...]
 | *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
 | *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
+| *replyToOnTimeoutMaxConcurrent{zwsp}Consumers* (advanced) | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS. | 1 | int
+| *requestTimeoutCheckerInterval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
-| *connectionPassword* (security) | The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
-| *connectionUsername* (security) | The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
-| *transactionCommitStrategy* (transaction) | To configure which kind of commit strategy to use. Camel provides two implementations out of the box, default and batch. |  | TransactionCommitStrategy
+| *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
+| *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 |===
 // component options: END
 
@@ -138,7 +124,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (47 parameters):
+=== Query Parameters (48 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -151,7 +137,7 @@ with the following path and query parameters:
 | *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100% strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transac [...]
 | *autoStartup* (consumer) | Specifies whether the consumer container should auto-startup. | true | boolean
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
-| *consumerCount* (consumer) | Sets the number of consumer listeners used for this endpoint. | 1 | int
+| *concurrentConsumers* (consumer) | Specifies the default number of concurrent consumers when consuming from JMS (not for request/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. When doing request/reply over JMS then the option replyToConcurrentConsumers is used to control number of concurrent consumers on the reply message listener. | 1 | int
 | *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
 | *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
 | *eagerLoadingOfProperties* (consumer) | Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes can catch early any issues with the underlying JMS provider and the use of JMS properties. See also the option eagerPoisonBody. | false | boolean
@@ -166,16 +152,18 @@ with the following path and query parameters:
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
+| *replyToConcurrentConsumers* (producer) | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. | 1 | int
 | *replyToOverride* (producer) | Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination. |  | String
+| *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  [...]
 | *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
 | *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
 | *disableTimeToLive* (producer) | Use this option to force disabling time to live. For example when you do request/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message being sent. The problem is that the sender and receiver systems have to have their clocks synchronized, so they are in sync. This is not always so easy to archive. So you can use disableTimeToLive=true to not set a time to live value on the sent message. Then the message w [...]
+| *includeSentJMSMessageID* (producer) | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination. | false | boolean
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
 | *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
 | *connectionFactory* (advanced) | Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any |  | ConnectionFactory
-| *connectionResource* (advanced) | Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any |  | ConnectionResource
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *exceptionListener* (advanced) | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. |  | ExceptionListener
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
@@ -189,97 +177,13 @@ with the following path and query parameters:
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
-| *transactionCommitStrategy* (transaction) | Sets the commit strategy. |  | TransactionCommitStrategy
 | *sharedJMSSession* (transaction) | Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS providers, use jms component to leverage XA transaction. | true | boolean
 |===
 // endpoint options: END
 
 
 Below is an example of how to configure the `SjmsComponent` with its
-required `ConnectionFactory` provider. It will create a single connection
-by default and store it using the components internal pooling APIs to
-ensure that it is able to service Session creation requests in a thread
-safe manner.
-
-[source,java]
-----
-SjmsComponent component = new SjmsComponent();
-component.setConnectionFactory(new ActiveMQConnectionFactory("tcp://localhost:61616"));
-getContext().addComponent("sjms", component);
-----
-
-For a SJMS component that is required to support a durable subscription,
-you can override the default `ConnectionFactoryResource` instance and set
-the `clientId` property.
-
-[source,java]
-----
-ConnectionFactoryResource connectionResource = new ConnectionFactoryResource();
-connectionResource.setConnectionFactory(new ActiveMQConnectionFactory("tcp://localhost:61616"));
-connectionResource.setClientId("myclient-id");
-
-SjmsComponent component = new SjmsComponent();
-component.setConnectionResource(connectionResource);
-component.setMaxConnections(1);
-----
-
-== Producer Usage
-
-=== InOnly Producer - (Default)
-
-The _InOnly_ producer is the default behavior of the SJMS Producer
-Endpoint.
-
-[source,java]
-----
-from("direct:start")
-    .to("sjms:queue:bar");
-----
-
-=== InOut Producer
-
-To enable _InOut_ behavior append the `exchangePattern` attribute to the
-URI. By default it will use a dedicated TemporaryQueue for each
-consumer.
-
-[source,java]
-----
-from("direct:start")
-    .to("sjms:queue:bar?exchangePattern=InOut");
-----
-
-You can specify a `replyTo` though which can provide a better
-monitor point.
-
-[source,java]
-----
-from("direct:start")
-    .to("sjms:queue:bar?replyTo=my.reply.to.queue");
-----
-
-== Consumer Usage
-
-=== InOnly Consumer - (Default)
-
-The _InOnly_ consumer is the default Exchange behavior of the SJMS
-Consumer Endpoint.
-
-[source,java]
-----
-from("sjms:queue:bar")
-    .to("mock:result");
-----
-
-=== InOut Consumer
-
-To enable _InOut_ behavior append the `exchangePattern` attribute to the
-URI.
-
-[source,java]
-----
-from("sjms:queue:in.out.test?exchangePattern=InOut")
-    .transform(constant("Bye Camel"));
-----
+required `ConnectionFactory` provider.
 
 
 == Reuse endpoint and send to different destinations computed at runtime
@@ -350,89 +254,29 @@ from("direct:order")
   .toD("sjms:order-${header.orderType}");
 --------------------------------
 
-== Advanced Usage Notes
-
-=== Plugable Connection Resource Management [[SJMS-connectionresource]]
-
-SJMS provides JMS `Connection`
-resource management through built-in connection pooling. This eliminates
-the need to depend on third party API pooling logic. However there may
-be times that you are required to use an external Connection resource
-manager such as those provided by J2EE or OSGi containers. For this SJMS
-provides an interface that can be used to override the internal SJMS
-Connection pooling capabilities. This is accomplished through the `ConnectionResource` interface.
-
-The `ConnectionResource`
-provides methods for borrowing and returning Connections as needed is
-the contract used to provide `Connection`
-pools to the SJMS component. A user should use when it is necessary to
-integrate SJMS with an external connection pooling manager.
+== Additional Notes
 
-It is recommended though that for standard JMS `ConnectionFactory`
-providers you use the `ConnectionFactoryResource`
-implementation that is provided with SJMS as-is or extend as it is
-optimized for this component.
+=== Local transactions
 
-Below is an example of using the plugable ConnectionResource with the
-ActiveMQ `PooledConnectionFactory`:
+When using `transacted=true` then JMS Transacted Acknowledge Mode are in use.
+The SJMS component supports this from both the consumer and producers. If a consumer
+is transacted, then the active JMS Session will commit or rollback at the end of processing the message.
 
-[source,java]
-----
-public class AMQConnectionResource implements ConnectionResource {
-    private PooledConnectionFactory pcf;
-
-    public AMQConnectionResource(String connectString, int maxConnections) {
-        super();
-        pcf = new PooledConnectionFactory(connectString);
-        pcf.setMaxConnections(maxConnections);
-        pcf.start();
-    }
-
-    public void stop() {
-        pcf.stop();
-    }
-
-    @Override
-    public Connection borrowConnection() throws Exception {
-        Connection answer = pcf.createConnection();
-        answer.start();
-        return answer;
-    }
-
-    @Override
-    public Connection borrowConnection(long timeout) throws Exception {
-        // SNIPPED...
-    }
-
-    @Override
-    public void returnConnection(Connection connection) throws Exception {
-        // Do nothing since there isn't a way to return a Connection
-        // to the instance of PooledConnectionFactory
-        log.info("Connection returned");
-    }
-}
-----
+SJMS producers that are `transacted=true` will also defer until the end of processing the message
+before the the active JMS Session will commit or rollback.
 
-Then pass in the `ConnectionResource` to the `SjmsComponent`:
+You can combine consumer and producer, such as:
 
 [source,java]
 ----
-CamelContext camelContext = new DefaultCamelContext();
-AMQConnectionResource pool = new AMQConnectionResource("tcp://localhost:33333", 1);
-SjmsComponent component = new SjmsComponent();
-component.setConnectionResource(pool);
-camelContext.addComponent("sjms", component);
+from("sjms:cheese?transacted=true")
+  .to("bean:foo")
+  .to("sjms:foo?transacted=true")
+  .to("bean:bar");
 ----
 
-=== Customizable Transaction Commit Strategies (Local JMS Transactions only)
-
-SJMS provides a developer the means to create a custom and plugable
-transaction strategy through the use of the `TransactionCommitStrategy`
-interface. This allows a user to define a unique set of circumstances
-that the `SessionTransactionSynchronization`
-will use to determine when to commit the Session.
-
-== Additional Notes
+Here the consumer and producer are both transacted, which means that only at the end of processing the message,
+then both the consumer and the producer will commit (or rollback in case of an exception during routing).
 
 === Message Header Format
 
@@ -468,18 +312,13 @@ dropped.
 === Clustering
 
 When using _InOut_ with SJMS in a clustered environment you must either
-use TemporaryQueue destinations or use a unique named reply to
+use TemporaryQueue destinations or use a unique reply to
 destination per InOut producer endpoint. Message correlation is handled
-by the endpoint, not with message selectors at the broker. The InOut
-Producer Endpoint uses Java Concurrency Exchangers cached by the Message
-`JMSCorrelationID`. This provides a nice performance increase while
-reducing the overhead on the broker since all the messages are consumed
-from the destination in the order they are produced by the interested
-consumer.
+by the producer, not with message selectors at the broker.
 
 [NOTE]
 ====
-You should only use queues as destination types, topics is not recommended or fully supported.
+You should only use queues as reply-to destination types, topics is not recommended or fully supported.
 ====
 
 Currently the only correlation strategy is to use the `JMSCorrelationId`.
@@ -487,26 +326,5 @@ The _InOut_ Consumer uses this strategy as well ensuring that all
 responses messages to the included `JMSReplyTo` destination also have the
 `JMSCorrelationId` copied from the request as well.
 
-== Transaction Support [[SJMS-transactions]]
-
-SJMS currently only supports the use of internal JMS Transactions. There
-is no support for the Camel Transaction Processor or the Java
-Transaction API (JTA).
-
-=== Does Springless Mean I Can't Use Spring?
-
-Not at all. Below is an example of the SJMS component using the Spring XML:
-
-[source,xml]
-----
-<route>
-    <from uri="direct:invoke.named.reply.to.queue" />
-    <to uri="sjms:queue:named.reply.to.queue?namedReplyTo=my.response.queue" />
-</route>
-----
-
-Springless refers to moving away from the dependency on the Spring JMS
-API. A new JMS client API is being developed from the ground up to power
-SJMS.
 
 include::camel-spring-boot::page$sjms-starter.adoc[]
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java
deleted file mode 100644
index 6ed1e19..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms;
-
-import javax.jms.Destination;
-import javax.jms.MessageConsumer;
-import javax.jms.Session;
-
-@Deprecated
-public class MessageConsumerResources {
-
-    private final Session session;
-    private final MessageConsumer messageConsumer;
-    private final Destination replyToDestination;
-
-    public MessageConsumerResources(MessageConsumer messageConsumer) {
-        this(null, messageConsumer, null);
-    }
-
-    public MessageConsumerResources(Session session, MessageConsumer messageConsumer) {
-        this(session, messageConsumer, null);
-    }
-
-    public MessageConsumerResources(Session session, MessageConsumer messageConsumer, Destination replyToDestination) {
-        this.session = session;
-        this.messageConsumer = messageConsumer;
-        this.replyToDestination = replyToDestination;
-    }
-
-    public Session getSession() {
-        return session;
-    }
-
-    public MessageConsumer getMessageConsumer() {
-        return messageConsumer;
-    }
-
-    public Destination getReplyToDestination() {
-        return replyToDestination;
-    }
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageListenerContainer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageListenerContainer.java
index e85772a..02a8b55 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageListenerContainer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageListenerContainer.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.sjms;
 
 import javax.jms.ConnectionFactory;
+import javax.jms.ExceptionListener;
 
 import org.apache.camel.AfterPropertiesConfigured;
 import org.apache.camel.Service;
@@ -27,4 +28,6 @@ public interface MessageListenerContainer extends Service, AfterPropertiesConfig
 
     void setMessageListener(SessionMessageListener messageListener);
 
+    void setExceptionListener(ExceptionListener exceptionListener);
+
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/OldSjmsConsumer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/OldSjmsConsumer.java
deleted file mode 100644
index 9138957..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/OldSjmsConsumer.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.WeakHashMap;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.stream.Collectors;
-
-import javax.jms.Connection;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.Session;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.Processor;
-import org.apache.camel.component.sjms.consumer.AbstractMessageHandler;
-import org.apache.camel.component.sjms.consumer.InOnlyMessageHandler;
-import org.apache.camel.component.sjms.consumer.InOutMessageHandler;
-import org.apache.camel.component.sjms.jms.ConnectionResource;
-import org.apache.camel.component.sjms.tx.DefaultTransactionCommitStrategy;
-import org.apache.camel.component.sjms.tx.SessionTransactionSynchronization;
-import org.apache.camel.spi.Synchronization;
-import org.apache.camel.support.DefaultConsumer;
-import org.apache.camel.util.backoff.BackOff;
-import org.apache.camel.util.backoff.BackOffTimer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The SjmsConsumer is the base class for the SJMS MessageListener pool.
- */
-@Deprecated
-public class OldSjmsConsumer extends DefaultConsumer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(OldSjmsConsumer.class);
-
-    private final Map<Connection, List<MessageConsumerResources>> consumers = new WeakHashMap<>();
-    private ScheduledExecutorService scheduler;
-    private Future<?> asyncStart;
-    private BackOffTimer.Task rescheduleTask;
-
-    public OldSjmsConsumer(Endpoint endpoint, Processor processor) {
-        super(endpoint, processor);
-    }
-
-    @Override
-    public SjmsEndpoint getEndpoint() {
-        return (SjmsEndpoint) super.getEndpoint();
-    }
-
-    @Override
-    protected void doStart() throws Exception {
-        super.doStart();
-
-        this.scheduler = getEndpoint().getCamelContext().getExecutorServiceManager().newDefaultScheduledThreadPool(this,
-                "SjmsConsumer");
-        if (getEndpoint().isAsyncStartListener()) {
-            asyncStart = getEndpoint().getComponent().getAsyncStartStopExecutorService().submit(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        fillConsumersPool();
-                    } catch (Throwable e) {
-                        LOG.warn("Error starting listener container on destination: " + getDestinationName()
-                                 + ". This exception will be ignored.",
-                                e);
-                        scheduleRefill(); //we should try to fill consumer pool on next time
-                    }
-                }
-
-                @Override
-                public String toString() {
-                    return "AsyncStartListenerTask[" + getDestinationName() + "]";
-                }
-            });
-        } else {
-            fillConsumersPool();
-        }
-    }
-
-    private void fillConsumersPool() throws Exception {
-        synchronized (consumers) {
-            while (consumers.values().stream().collect(Collectors.summarizingInt(List::size)).getSum() < getConsumerCount()) {
-                addConsumer();
-            }
-        }
-    }
-
-    public void destroyObject(MessageConsumerResources model) {
-        try {
-            if (model.getMessageConsumer() != null) {
-                model.getMessageConsumer().close();
-            }
-
-            // If the resource has a
-            if (model.getSession() != null) {
-                if (model.getSession().getTransacted()) {
-                    try {
-                        model.getSession().rollback();
-                    } catch (Exception e) {
-                        // Do nothing. Just make sure we are cleaned up
-                    }
-                }
-                model.getSession().close();
-            }
-        } catch (JMSException ex) {
-            LOG.warn("Exception caught on closing consumer", ex);
-        }
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        super.doStop();
-        if (asyncStart != null && !asyncStart.isDone()) {
-            asyncStart.cancel(true);
-        }
-        if (rescheduleTask != null) {
-            rescheduleTask.cancel();
-        }
-        if (getEndpoint().isAsyncStopListener()) {
-            getEndpoint().getComponent().getAsyncStartStopExecutorService().submit(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        synchronized (consumers) {
-                            consumers.values().stream().flatMap(Collection::stream).forEach(OldSjmsConsumer.this::destroyObject);
-                            consumers.clear();
-                        }
-                    } catch (Throwable e) {
-                        LOG.warn("Error stopping listener container on destination: " + getDestinationName()
-                                 + ". This exception will be ignored.",
-                                e);
-                    }
-                }
-
-                @Override
-                public String toString() {
-                    return "AsyncStopListenerTask[" + getDestinationName() + "]";
-                }
-            });
-        } else {
-            synchronized (consumers) {
-                consumers.values().stream().flatMap(Collection::stream).forEach(OldSjmsConsumer.this::destroyObject);
-                consumers.clear();
-            }
-        }
-        if (this.scheduler != null) {
-            getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(this.scheduler);
-        }
-    }
-
-    /**
-     * Creates a {@link MessageConsumerResources} with a dedicated {@link Session} required for transacted and InOut
-     * consumers.
-     */
-    private void addConsumer() throws Exception {
-        MessageConsumerResources answer;
-        ConnectionResource connectionResource = getOrCreateConnectionResource();
-        Connection conn = connectionResource.borrowConnection();
-        try {
-            Session session = conn.createSession(isTransacted(),
-                    isTransacted() ? Session.SESSION_TRANSACTED : Session.AUTO_ACKNOWLEDGE);
-            MessageConsumer messageConsumer = getEndpoint().getJmsObjectFactory().createMessageConsumer(session, getEndpoint());
-            MessageListener handler = createMessageHandler(session);
-            messageConsumer.setMessageListener(handler);
-
-            ExceptionListener exceptionListener = conn.getExceptionListener();
-            ReconnectExceptionListener reconnectExceptionListener = new ReconnectExceptionListener(conn);
-            if (exceptionListener == null) {
-                exceptionListener = reconnectExceptionListener;
-            } else {
-                exceptionListener = new AggregatedExceptionListener(exceptionListener, reconnectExceptionListener);
-            }
-            conn.setExceptionListener(exceptionListener);
-            answer = new MessageConsumerResources(session, messageConsumer);
-            consumers.compute(conn, (key, oldValue) -> {
-                if (oldValue == null) {
-                    oldValue = new ArrayList<>();
-                }
-                oldValue.add(answer);
-                return oldValue;
-            });
-        } catch (Exception e) {
-            LOG.error("Unable to create the MessageConsumer", e);
-            throw e;
-        } finally {
-            connectionResource.returnConnection(conn);
-        }
-    }
-
-    /**
-     * Helper factory method used to create a MessageListener based on the MEP
-     *
-     * @param  session a session is only required if we are a transacted consumer
-     * @return         the listener
-     */
-    protected MessageListener createMessageHandler(Session session) {
-        TransactionCommitStrategy commitStrategy;
-        if (getTransactionCommitStrategy() != null) {
-            commitStrategy = getTransactionCommitStrategy();
-        } else {
-            commitStrategy = new DefaultTransactionCommitStrategy();
-        }
-
-        Synchronization synchronization = new SessionTransactionSynchronization(null, session, commitStrategy, false);
-
-        AbstractMessageHandler messageHandler;
-        if (getEndpoint().getExchangePattern().equals(ExchangePattern.InOnly)) {
-            if (isTransacted() || isSynchronous()) {
-                messageHandler = new InOnlyMessageHandler(getEndpoint(), scheduler, synchronization);
-            } else {
-                messageHandler = new InOnlyMessageHandler(getEndpoint(), scheduler);
-            }
-        } else {
-            if (isTransacted() || isSynchronous()) {
-                messageHandler = new InOutMessageHandler(getEndpoint(), scheduler, synchronization);
-            } else {
-                messageHandler = new InOutMessageHandler(getEndpoint(), scheduler);
-            }
-        }
-
-        messageHandler.setSession(session);
-        messageHandler.setProcessor(getAsyncProcessor());
-        messageHandler.setSynchronous(isSynchronous());
-        messageHandler.setTransacted(isTransacted());
-        messageHandler.setSharedJMSSession(isSharedJMSSession());
-        messageHandler.setTopic(isTopic());
-        return messageHandler;
-    }
-
-    /**
-     * @deprecated use {@link #getOrCreateConnectionResource()}
-     */
-    @Deprecated
-    protected ConnectionResource getConnectionResource() {
-        return getEndpoint().getConnectionResource();
-    }
-
-    protected ConnectionResource getOrCreateConnectionResource() {
-        ConnectionResource answer = getEndpoint().getConnectionResource();
-        if (answer == null) {
-            answer = getEndpoint().createConnectionResource(this);
-        }
-        return answer;
-    }
-
-    public int getAcknowledgementMode() {
-        return getEndpoint().getAcknowledgementMode().intValue();
-    }
-
-    /**
-     * Use to determine if transactions are enabled or disabled.
-     *
-     * @return true if transacted, otherwise false
-     */
-    public boolean isTransacted() {
-        return getEndpoint().isTransacted();
-    }
-
-    /**
-     * Use to determine if JMS session should be propagated to share with other SJMS endpoints.
-     *
-     * @return true if shared, otherwise false
-     */
-    public boolean isSharedJMSSession() {
-        return getEndpoint().isSharedJMSSession();
-    }
-
-    /**
-     * Use to determine whether or not to process exchanges synchronously.
-     *
-     * @return true if synchronous
-     */
-    public boolean isSynchronous() {
-        return getEndpoint().isSynchronous();
-    }
-
-    /**
-     * The destination name for this consumer.
-     *
-     * @return String
-     */
-    public String getDestinationName() {
-        return getEndpoint().getDestinationName();
-    }
-
-    /**
-     * Returns the number of consumer listeners.
-     *
-     * @return the consumerCount
-     */
-    public int getConsumerCount() {
-        return getEndpoint().getConsumerCount();
-    }
-
-    /**
-     * Flag set by the endpoint used by consumers and producers to determine if the consumer is a JMS Topic.
-     *
-     * @return the topic true if consumer is a JMS Topic, default is false
-     */
-    public boolean isTopic() {
-        return getEndpoint().isTopic();
-    }
-
-    /**
-     * Gets the JMS Message selector syntax.
-     */
-    public String getMessageSelector() {
-        return getEndpoint().getMessageSelector();
-    }
-
-    /**
-     * Gets the durable subscription Id.
-     *
-     * @return the durableSubscriptionId
-     */
-    public String getDurableSubscriptionId() {
-        return getEndpoint().getDurableSubscriptionId();
-    }
-
-    /**
-     * Gets the commit strategy.
-     *
-     * @return the transactionCommitStrategy
-     */
-    public TransactionCommitStrategy getTransactionCommitStrategy() {
-        return getEndpoint().getTransactionCommitStrategy();
-    }
-
-    private boolean refillPool(BackOffTimer.Task task) {
-        LOG.debug("Refill consumers pool task running");
-        try {
-            fillConsumersPool();
-            LOG.info("Refill consumers pool completed (attempt: {})", task.getCurrentAttempts());
-            return false;
-        } catch (Exception ex) {
-            LOG.warn(
-                    "Refill consumers pool failed (attempt: {}) due to: {}. Will try again in {} millis. (stacktrace in DEBUG level)",
-                    task.getCurrentAttempts(), ex.getMessage(), task.getCurrentDelay());
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("Refill consumers pool failed", ex);
-            }
-        }
-        return true;
-    }
-
-    private void scheduleRefill() {
-        if (rescheduleTask == null || rescheduleTask.getStatus() != BackOffTimer.Task.Status.Active) {
-            BackOff backOff = BackOff.builder().delay(getEndpoint().getRecoveryInterval()).build();
-            rescheduleTask = new BackOffTimer(scheduler).schedule(backOff, this::refillPool);
-        }
-    }
-
-    private final class ReconnectExceptionListener implements ExceptionListener {
-        private final WeakReference<Connection> connection;
-
-        private ReconnectExceptionListener(Connection connection) {
-            this.connection = new WeakReference<>(connection);
-        }
-
-        @Override
-        public void onException(JMSException exception) {
-            LOG.debug("Handling JMSException for reconnecting", exception);
-            Connection currentConnection = connection.get();
-            if (currentConnection != null) {
-                synchronized (consumers) {
-                    List<MessageConsumerResources> toClose = consumers.get(currentConnection);
-                    if (toClose != null) {
-                        toClose.forEach(OldSjmsConsumer.this::destroyObject);
-                    }
-                    consumers.remove(currentConnection);
-                }
-                scheduleRefill();
-            }
-        }
-
-        //hash and equals to prevent multiple instances for same connection
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            ReconnectExceptionListener that = (ReconnectExceptionListener) o;
-            return Objects.equals(connection.get(), that.connection.get());
-        }
-
-        @Override
-        public int hashCode() {
-            final Connection currentConnection = this.connection.get();
-            return currentConnection == null ? 0 : currentConnection.hashCode();
-        }
-    }
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/DefaultTransactionCommitStrategy.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/ReplyToType.java
similarity index 62%
copy from components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/DefaultTransactionCommitStrategy.java
copy to components/camel-sjms/src/main/java/org/apache/camel/component/sjms/ReplyToType.java
index a6fbfac..d40808f 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/DefaultTransactionCommitStrategy.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/ReplyToType.java
@@ -14,23 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.sjms.tx;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.component.sjms.TransactionCommitStrategy;
+package org.apache.camel.component.sjms;
 
 /**
- * The default commit strategy for all transaction.
+ * Types for replyTo queues
  */
-public class DefaultTransactionCommitStrategy implements TransactionCommitStrategy {
+public enum ReplyToType {
 
-    @Override
-    public boolean commit(Exchange exchange) throws Exception {
-        return true;
-    }
+    Temporary,
+    Exclusive
 
-    @Override
-    public boolean rollback(Exchange exchange) throws Exception {
-        return true;
-    }
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
index a8865f4..e63a069 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
@@ -24,18 +24,15 @@ import javax.jms.ConnectionFactory;
 import org.apache.camel.CamelException;
 import org.apache.camel.Endpoint;
 import org.apache.camel.ExchangePattern;
-import org.apache.camel.component.sjms.jms.ConnectionResource;
 import org.apache.camel.component.sjms.jms.DefaultJmsKeyFormatStrategy;
 import org.apache.camel.component.sjms.jms.DestinationCreationStrategy;
 import org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy;
 import org.apache.camel.component.sjms.jms.MessageCreatedStrategy;
 import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.annotations.Component;
 import org.apache.camel.support.HeaderFilterStrategyComponent;
 
-/**
- * The <a href="http://camel.apache.org/sjms">Simple JMS</a> component.
- */
 @Component("sjms")
 public class SjmsComponent extends HeaderFilterStrategyComponent {
 
@@ -44,10 +41,16 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
     @Metadata(label = "common", autowired = true,
               description = "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.")
     private ConnectionFactory connectionFactory;
-    @Metadata(label = "advanced",
-              description = "A ConnectionResource is an interface that allows for customization and container control of the ConnectionFactory."
-                            + " See Plugable Connection Resource Management for further details.")
-    private ConnectionResource connectionResource;
+    @Metadata(label = "security", secret = true,
+              description = "Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory.")
+    private String username;
+    @Metadata(label = "security", secret = true,
+              description = "Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory.")
+    private String password;
+    @UriParam(description = "Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance."
+                            + " It is typically only required for durable topic subscriptions."
+                            + " If using Apache ActiveMQ you may prefer to use Virtual Topics instead.")
+    private String clientId;
     @Metadata(label = "advanced",
               description = "Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification."
                             + " Camel provides one implementation out of the box: default. The default strategy will safely marshal dots and hyphens (. and -)."
@@ -57,38 +60,24 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
     @Metadata(defaultValue = "1",
               description = "The maximum number of connections available to endpoints started under this component")
     private Integer connectionCount = 1;
-    @Metadata(label = "transaction",
-              description = "To configure which kind of commit strategy to use. Camel provides two implementations out of the box, default and batch.")
-    private TransactionCommitStrategy transactionCommitStrategy;
     @Metadata(label = "advanced", description = "To use a custom DestinationCreationStrategy.")
     private DestinationCreationStrategy destinationCreationStrategy;
     @Metadata(label = "advanced",
               description = "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.")
     private MessageCreatedStrategy messageCreatedStrategy;
-    @Metadata(label = "advanced", defaultValue = "true",
-              description = "When using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource"
-                            + " then should each javax.jms.Connection be tested before being used.")
-    private boolean connectionTestOnBorrow = true;
-    @Metadata(label = "security", secret = true,
-              description = "The username to use when creating javax.jms.Connection when using the"
-                            + " default org.apache.camel.component.sjms.jms.ConnectionFactoryResource.")
-    private String connectionUsername;
-    @Metadata(label = "security", secret = true,
-              description = "The password to use when creating javax.jms.Connection when using the"
-                            + " default org.apache.camel.component.sjms.jms.ConnectionFactoryResource.")
-    private String connectionPassword;
-    @Metadata(label = "advanced", description = "The client ID to use when creating javax.jms.Connection when using the"
-                                                + " default org.apache.camel.component.sjms.jms.ConnectionFactoryResource.")
-    private String connectionClientId;
-    @Metadata(label = "advanced", defaultValue = "5000",
-              description = "The max wait time in millis to block and wait on free connection when the pool"
-                            + " is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource.")
-    private long connectionMaxWait = 5000;
     @Metadata(defaultValue = "5000", label = "advanced", javaType = "java.time.Duration",
               description = "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds."
                             + " The default is 5000 ms, that is, 5 seconds.")
     private long recoveryInterval = 5000;
+    @Metadata(defaultValue = "1000", label = "advanced", javaType = "java.time.Duration",
+              description = "Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS."
+                            + " By default Camel checks once per second. But if you must react faster when a timeout occurs,"
+                            + " then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout.")
+    private long requestTimeoutCheckerInterval = 1000L;
+    @Metadata(label = "advanced", defaultValue = "1",
+              description = "Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS.")
+    private int replyToOnTimeoutMaxConcurrentConsumers = 1;
 
     public SjmsComponent() {
     }
@@ -103,9 +92,6 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
         if (endpoint.isTransacted()) {
             endpoint.setSynchronous(true);
         }
-        if (transactionCommitStrategy != null) {
-            endpoint.setTransactionCommitStrategy(transactionCommitStrategy);
-        }
         if (destinationCreationStrategy != null) {
             endpoint.setDestinationCreationStrategy(destinationCreationStrategy);
         }
@@ -164,10 +150,6 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
         return asyncStartStopExecutorService;
     }
 
-    /**
-     * A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a
-     * ConnectionResource.
-     */
     public void setConnectionFactory(ConnectionFactory connectionFactory) {
         this.connectionFactory = connectionFactory;
     }
@@ -176,21 +158,6 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
         return connectionFactory;
     }
 
-    /**
-     * A ConnectionResource is an interface that allows for customization and container control of the
-     * ConnectionFactory. See Plugable Connection Resource Management for further details.
-     */
-    public void setConnectionResource(ConnectionResource connectionResource) {
-        this.connectionResource = connectionResource;
-    }
-
-    public ConnectionResource getConnectionResource() {
-        return connectionResource;
-    }
-
-    /**
-     * The maximum number of connections available to endpoints started under this component
-     */
     public void setConnectionCount(Integer maxConnections) {
         this.connectionCount = maxConnections;
     }
@@ -199,13 +166,6 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
         return connectionCount;
     }
 
-    /**
-     * Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel
-     * provides one implementation out of the box: default. The default strategy will safely marshal dots and hyphens (.
-     * and -). 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.
-     */
     public void setJmsKeyFormatStrategy(JmsKeyFormatStrategy jmsKeyFormatStrategy) {
         this.jmsKeyFormatStrategy = jmsKeyFormatStrategy;
     }
@@ -214,25 +174,10 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
         return jmsKeyFormatStrategy;
     }
 
-    public TransactionCommitStrategy getTransactionCommitStrategy() {
-        return transactionCommitStrategy;
-    }
-
-    /**
-     * To configure which kind of commit strategy to use. Camel provides two implementations out of the box, default and
-     * batch.
-     */
-    public void setTransactionCommitStrategy(TransactionCommitStrategy commitStrategy) {
-        this.transactionCommitStrategy = commitStrategy;
-    }
-
     public DestinationCreationStrategy getDestinationCreationStrategy() {
         return destinationCreationStrategy;
     }
 
-    /**
-     * To use a custom DestinationCreationStrategy.
-     */
     public void setDestinationCreationStrategy(DestinationCreationStrategy destinationCreationStrategy) {
         this.destinationCreationStrategy = destinationCreationStrategy;
     }
@@ -241,79 +186,55 @@ public class SjmsComponent extends HeaderFilterStrategyComponent {
         return messageCreatedStrategy;
     }
 
-    /**
-     * To use the given MessageCreatedStrategy which are invoked when Camel creates new instances of
-     * <tt>javax.jms.Message</tt> objects when Camel is sending a JMS message.
-     */
     public void setMessageCreatedStrategy(MessageCreatedStrategy messageCreatedStrategy) {
         this.messageCreatedStrategy = messageCreatedStrategy;
     }
 
-    public boolean isConnectionTestOnBorrow() {
-        return connectionTestOnBorrow;
+    public String getUsername() {
+        return username;
     }
 
-    /**
-     * When using the default {@link org.apache.camel.component.sjms.jms.ConnectionFactoryResource} then should each
-     * {@link javax.jms.Connection} be tested before being used.
-     */
-    public void setConnectionTestOnBorrow(boolean connectionTestOnBorrow) {
-        this.connectionTestOnBorrow = connectionTestOnBorrow;
+    public void setUsername(String username) {
+        this.username = username;
     }
 
-    public String getConnectionUsername() {
-        return connectionUsername;
+    public String getPassword() {
+        return password;
     }
 
-    /**
-     * The username to use when creating {@link javax.jms.Connection} when using the default
-     * {@link org.apache.camel.component.sjms.jms.ConnectionFactoryResource}.
-     */
-    public void setConnectionUsername(String connectionUsername) {
-        this.connectionUsername = connectionUsername;
+    public void setPassword(String password) {
+        this.password = password;
     }
 
-    public String getConnectionPassword() {
-        return connectionPassword;
+    public String getClientId() {
+        return clientId;
     }
 
-    /**
-     * The password to use when creating {@link javax.jms.Connection} when using the default
-     * {@link org.apache.camel.component.sjms.jms.ConnectionFactoryResource}.
-     */
-    public void setConnectionPassword(String connectionPassword) {
-        this.connectionPassword = connectionPassword;
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
     }
 
-    public String getConnectionClientId() {
-        return connectionClientId;
+    public long getRecoveryInterval() {
+        return recoveryInterval;
     }
 
-    /**
-     * The client ID to use when creating {@link javax.jms.Connection} when using the default
-     * {@link org.apache.camel.component.sjms.jms.ConnectionFactoryResource}.
-     */
-    public void setConnectionClientId(String connectionClientId) {
-        this.connectionClientId = connectionClientId;
+    public void setRecoveryInterval(long recoveryInterval) {
+        this.recoveryInterval = recoveryInterval;
     }
 
-    public long getConnectionMaxWait() {
-        return connectionMaxWait;
+    public long getRequestTimeoutCheckerInterval() {
+        return requestTimeoutCheckerInterval;
     }
 
-    /**
-     * The max wait time in millis to block and wait on free connection when the pool is exhausted when using the
-     * default {@link org.apache.camel.component.sjms.jms.ConnectionFactoryResource}.
-     */
-    public void setConnectionMaxWait(long connectionMaxWait) {
-        this.connectionMaxWait = connectionMaxWait;
+    public void setRequestTimeoutCheckerInterval(long requestTimeoutCheckerInterval) {
+        this.requestTimeoutCheckerInterval = requestTimeoutCheckerInterval;
     }
 
-    public long getRecoveryInterval() {
-        return recoveryInterval;
+    public int getReplyToOnTimeoutMaxConcurrentConsumers() {
+        return replyToOnTimeoutMaxConcurrentConsumers;
     }
 
-    public void setRecoveryInterval(long recoveryInterval) {
-        this.recoveryInterval = recoveryInterval;
+    public void setReplyToOnTimeoutMaxConcurrentConsumers(int replyToOnTimeoutMaxConcurrentConsumers) {
+        this.replyToOnTimeoutMaxConcurrentConsumers = replyToOnTimeoutMaxConcurrentConsumers;
     }
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
index ee3c230..5c146a3 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
@@ -34,11 +34,8 @@ import org.apache.camel.LoggingLevel;
 import org.apache.camel.MultipleConsumersSupport;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
-import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.sjms.consumer.EndpointMessageListener;
 import org.apache.camel.component.sjms.consumer.SimpleMessageListenerContainer;
-import org.apache.camel.component.sjms.jms.ConnectionFactoryResource;
-import org.apache.camel.component.sjms.jms.ConnectionResource;
 import org.apache.camel.component.sjms.jms.DefaultDestinationCreationStrategy;
 import org.apache.camel.component.sjms.jms.DefaultJmsKeyFormatStrategy;
 import org.apache.camel.component.sjms.jms.DestinationCreationStrategy;
@@ -46,11 +43,10 @@ import org.apache.camel.component.sjms.jms.DestinationNameParser;
 import org.apache.camel.component.sjms.jms.Jms11ObjectFactory;
 import org.apache.camel.component.sjms.jms.JmsBinding;
 import org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy;
+import org.apache.camel.component.sjms.jms.JmsMessageHelper;
 import org.apache.camel.component.sjms.jms.JmsObjectFactory;
 import org.apache.camel.component.sjms.jms.MessageCreatedStrategy;
 import org.apache.camel.component.sjms.jms.SessionAcknowledgementType;
-import org.apache.camel.component.sjms.producer.InOnlyProducer;
-import org.apache.camel.component.sjms.producer.InOutProducer;
 import org.apache.camel.spi.HeaderFilterStrategy;
 import org.apache.camel.spi.HeaderFilterStrategyAware;
 import org.apache.camel.spi.Metadata;
@@ -59,9 +55,8 @@ import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
 import org.apache.camel.support.DefaultEndpoint;
 import org.apache.camel.support.EndpointHelper;
-import org.apache.camel.support.LoggingExceptionHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.camel.support.SynchronousDelegateProducer;
+import org.apache.camel.util.StringHelper;
 
 /**
  * Send and receive messages to/from a JMS Queue or Topic using plain JMS 1.x API.
@@ -73,8 +68,6 @@ import org.slf4j.LoggerFactory;
 public class SjmsEndpoint extends DefaultEndpoint
         implements AsyncEndpoint, MultipleConsumersSupport, HeaderFilterStrategyAware {
 
-    private static final Logger LOG = LoggerFactory.getLogger(SjmsEndpoint.class);
-
     private boolean topic;
     private JmsBinding binding;
 
@@ -100,13 +93,28 @@ public class SjmsEndpoint extends DefaultEndpoint
     @UriParam(label = "common",
               description = "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer).")
     private String replyTo;
+    @UriParam(label = "producer",
+              description = "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.")
+    private ReplyToType replyToType;
     @UriParam(defaultValue = "AUTO_ACKNOWLEDGE",
               enums = "SESSION_TRANSACTED,CLIENT_ACKNOWLEDGE,AUTO_ACKNOWLEDGE,DUPS_OK_ACKNOWLEDGE",
               description = "The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE")
     private SessionAcknowledgementType acknowledgementMode = SessionAcknowledgementType.AUTO_ACKNOWLEDGE;
-    @UriParam(label = "consumer", defaultValue = "1",
-              description = "Sets the number of consumer listeners used for this endpoint.")
-    private int consumerCount = 1;
+    @UriParam(defaultValue = "1", label = "consumer",
+              description = "Specifies the default number of concurrent consumers when consuming from JMS (not for request/reply over JMS)."
+                            + " See also the maxMessagesPerTask option to control dynamic scaling up/down of threads."
+                            + " When doing request/reply over JMS then the option replyToConcurrentConsumers is used to control number"
+                            + " of concurrent consumers on the reply message listener.")
+    private int concurrentConsumers = 1;
+    @UriParam(defaultValue = "1", label = "producer",
+              description = "Specifies the default number of concurrent consumers when doing request/reply over JMS."
+                            + " See also the maxMessagesPerTask option to control dynamic scaling up/down of threads.")
+    private int replyToConcurrentConsumers = 1;
     @UriParam(label = "producer", defaultValue = "false",
               description = "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."
@@ -203,9 +211,6 @@ public class SjmsEndpoint extends DefaultEndpoint
               description = "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc."
                             + " See section about how mapping works below for more details.")
     private boolean mapJmsMessage = true;
-    @UriParam(label = "transaction",
-              description = "Sets the commit strategy.")
-    private TransactionCommitStrategy transactionCommitStrategy;
     @UriParam(label = "advanced",
               description = "To use a custom DestinationCreationStrategy.")
     private DestinationCreationStrategy destinationCreationStrategy = new DefaultDestinationCreationStrategy();
@@ -219,9 +224,6 @@ public class SjmsEndpoint extends DefaultEndpoint
                             + " You can provide your own implementation of the org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the # notation.")
     private JmsKeyFormatStrategy jmsKeyFormatStrategy;
     @UriParam(label = "advanced",
-              description = "Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any")
-    private ConnectionResource connectionResource;
-    @UriParam(label = "advanced",
               description = "Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any")
     private ConnectionFactory connectionFactory;
     @UriParam(label = "advanced",
@@ -270,6 +272,11 @@ public class SjmsEndpoint extends DefaultEndpoint
                             + " Note if transacted has been enabled, then asyncConsumer=true does not run asynchronously, as transaction"
                             + "  must be executed synchronously (Camel 3.0 may support async transactions).")
     private boolean asyncConsumer;
+    @UriParam(label = "producer,advanced",
+              description = "Only applicable when sending to JMS destination using InOnly (eg fire and forget)."
+                            + " Enabling this option will enrich the Camel Exchange with the actual JMSMessageID"
+                            + " that was used by the JMS client when the message was sent to the JMS destination.")
+    private boolean includeSentJMSMessageID;
 
     private JmsObjectFactory jmsObjectFactory = new Jms11ObjectFactory();
 
@@ -287,21 +294,48 @@ public class SjmsEndpoint extends DefaultEndpoint
         return (SjmsComponent) super.getComponent();
     }
 
+    /**
+     * Gets the destination name which was configured from the endpoint uri.
+     *
+     * @return the destination name resolved from the endpoint uri
+     */
+    public String getEndpointConfiguredDestinationName() {
+        String remainder = StringHelper.after(getEndpointKey(), "//");
+        if (remainder != null && remainder.contains("?")) {
+            // remove parameters
+            remainder = StringHelper.before(remainder, "?");
+        }
+        return JmsMessageHelper.normalizeDestinationName(remainder);
+    }
+
     @Override
     public Producer createProducer() throws Exception {
-        SjmsProducer producer;
-        // TODO: Merge inOutProducer and InOnlyProducer into one class so this can be dynamic via exchange MEP
-        if (!isDisableReplyTo() && getExchangePattern().equals(ExchangePattern.InOut)) {
-            producer = new InOutProducer(this);
+        if (isTransacted() && getExchangePattern().isOutCapable()) {
+            throw new IllegalArgumentException("SjmsProducer cannot be both transacted=true and exchangePattern=InOut");
+        }
+
+        Producer answer = new SjmsProducer(this);
+        if (isSynchronous()) {
+            return new SynchronousDelegateProducer(answer);
         } else {
-            producer = new InOnlyProducer(this);
+            return answer;
         }
-        return producer;
     }
 
     @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         EndpointMessageListener listener = new EndpointMessageListener(this, processor);
+        configureMessageListener(listener);
+
+        MessageListenerContainer container = createMessageListenerContainer(this);
+        container.setMessageListener(listener);
+
+        SjmsConsumer consumer = new SjmsConsumer(this, processor, container);
+        configureConsumer(consumer);
+        return consumer;
+    }
+
+    public void configureMessageListener(EndpointMessageListener listener) {
         if (isDisableReplyTo()) {
             listener.setDisableReplyTo(true);
         }
@@ -313,13 +347,6 @@ public class SjmsEndpoint extends DefaultEndpoint
             listener.setReplyToDestination(getReplyTo());
         }
         listener.setAsync(isAsyncConsumer());
-
-        MessageListenerContainer container = createMessageListenerContainer(this);
-        container.setMessageListener(listener);
-
-        SjmsConsumer consumer = new SjmsConsumer(this, processor, container);
-        configureConsumer(consumer);
-        return consumer;
     }
 
     @Override
@@ -327,37 +354,6 @@ public class SjmsEndpoint extends DefaultEndpoint
         return true;
     }
 
-    @Deprecated
-    public ConnectionResource createConnectionResource(Object source) {
-        if (getConnectionFactory() == null) {
-            throw new IllegalArgumentException(
-                    String.format("ConnectionResource or ConnectionFactory must be configured for %s", this));
-        }
-
-        try {
-            LOG.debug("Creating ConnectionResource with connectionCount: {} using ConnectionFactory: {}",
-                    getConnectionCount(), getConnectionFactory());
-            // We always use a connection pool, even for a pool of 1
-            ConnectionFactoryResource connections = new ConnectionFactoryResource(
-                    getConnectionCount(), getConnectionFactory(),
-                    getComponent().getConnectionUsername(), getComponent().getConnectionPassword(),
-                    getComponent().getConnectionClientId(),
-                    getComponent().getConnectionMaxWait(), getComponent().isConnectionTestOnBorrow());
-            if (exceptionListener != null) {
-                connections.setExceptionListener(exceptionListener);
-            } else {
-                // add a exception listener that logs so we can see any errors that happens
-                ExceptionListener listener = new SjmsLoggingExceptionListener(
-                        new LoggingExceptionHandler(getCamelContext(), source.getClass()), isErrorHandlerLogStackTrace());
-                connections.setExceptionListener(listener);
-            }
-            connections.fillPool();
-            return connections;
-        } catch (Exception e) {
-            throw RuntimeCamelException.wrapRuntimeCamelException(e);
-        }
-    }
-
     public Exchange createExchange(Message message, Session session) {
         Exchange exchange = createExchange(getExchangePattern());
         exchange.setIn(new SjmsMessage(exchange, message, session, getBinding()));
@@ -379,6 +375,7 @@ public class SjmsEndpoint extends DefaultEndpoint
             }
             template.setQoSSettings(dm, getPriority(), getTimeToLive());
         }
+        template.setDestinationCreationStrategy(getDestinationCreationStrategy());
 
         return template;
     }
@@ -399,11 +396,15 @@ public class SjmsEndpoint extends DefaultEndpoint
                 template.setQoSSettings(0, 0, ttl);
             }
         }
+        template.setDestinationCreationStrategy(getDestinationCreationStrategy());
+
         return template;
     }
 
     public MessageListenerContainer createMessageListenerContainer(SjmsEndpoint endpoint) throws Exception {
-        return new SimpleMessageListenerContainer(endpoint);
+        SimpleMessageListenerContainer answer = new SimpleMessageListenerContainer(endpoint);
+        answer.setConcurrentConsumers(concurrentConsumers);
+        return answer;
     }
 
     /**
@@ -497,30 +498,6 @@ public class SjmsEndpoint extends DefaultEndpoint
         this.includeAllJMSXProperties = includeAllJMSXProperties;
     }
 
-    public ConnectionResource getConnectionResource() {
-        ConnectionResource answer = null;
-        if (connectionResource != null) {
-            answer = connectionResource;
-        }
-        if (answer == null) {
-            answer = getComponent().getConnectionResource();
-        }
-        return answer;
-    }
-
-    /**
-     * Initializes the connectionResource for the endpoint, which takes precedence over the component's
-     * connectionResource, if any
-     */
-    public void setConnectionResource(ConnectionResource connectionResource) {
-        this.connectionResource = connectionResource;
-    }
-
-    public void setConnectionResource(String connectionResource) {
-        this.connectionResource
-                = EndpointHelper.resolveReferenceParameter(getCamelContext(), connectionResource, ConnectionResource.class);
-    }
-
     public SessionAcknowledgementType getAcknowledgementMode() {
         return acknowledgementMode;
     }
@@ -540,15 +517,20 @@ public class SjmsEndpoint extends DefaultEndpoint
         return topic;
     }
 
-    public int getConsumerCount() {
-        return consumerCount;
+    public int getConcurrentConsumers() {
+        return concurrentConsumers;
     }
 
-    /**
-     * Sets the number of consumer listeners used for this endpoint.
-     */
-    public void setConsumerCount(int consumerCount) {
-        this.consumerCount = consumerCount;
+    public void setConcurrentConsumers(int concurrentConsumers) {
+        this.concurrentConsumers = concurrentConsumers;
+    }
+
+    public int getReplyToConcurrentConsumers() {
+        return replyToConcurrentConsumers;
+    }
+
+    public void setReplyToConcurrentConsumers(int replyToConcurrentConsumers) {
+        this.replyToConcurrentConsumers = replyToConcurrentConsumers;
     }
 
     public Boolean getExplicitQosEnabled() {
@@ -669,17 +651,6 @@ public class SjmsEndpoint extends DefaultEndpoint
         this.messageSelector = messageSelector;
     }
 
-    public TransactionCommitStrategy getTransactionCommitStrategy() {
-        return transactionCommitStrategy;
-    }
-
-    /**
-     * Sets the commit strategy.
-     */
-    public void setTransactionCommitStrategy(TransactionCommitStrategy transactionCommitStrategy) {
-        this.transactionCommitStrategy = transactionCommitStrategy;
-    }
-
     public boolean isTransacted() {
         return transacted;
     }
@@ -716,6 +687,14 @@ public class SjmsEndpoint extends DefaultEndpoint
         setExchangePattern(ExchangePattern.InOut);
     }
 
+    public ReplyToType getReplyToType() {
+        return replyToType;
+    }
+
+    public void setReplyToType(ReplyToType replyToType) {
+        this.replyToType = replyToType;
+    }
+
     public boolean isTestConnectionOnStartup() {
         return testConnectionOnStartup;
     }
@@ -941,4 +920,12 @@ public class SjmsEndpoint extends DefaultEndpoint
     public void setAsyncConsumer(boolean asyncConsumer) {
         this.asyncConsumer = asyncConsumer;
     }
+
+    public boolean isIncludeSentJMSMessageID() {
+        return includeSentJMSMessageID;
+    }
+
+    public void setIncludeSentJMSMessageID(boolean includeSentJMSMessageID) {
+        this.includeSentJMSMessageID = includeSentJMSMessageID;
+    }
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsHelper.java
index bff6ecc..013ce1b 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsHelper.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsHelper.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.sjms;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
+import javax.jms.Message;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
@@ -80,11 +81,32 @@ public final class SjmsHelper {
         }
     }
 
-    public static void rollbackIfNecessary(Session session) throws JMSException {
-        try {
-            session.rollback();
-        } catch (javax.jms.TransactionInProgressException | javax.jms.IllegalStateException ex) {
-            // ignore
+    public static void commitIfNeeded(Session session, Message message) throws Exception {
+        if (session.getTransacted()) {
+            SjmsHelper.commitIfNecessary(session);
+        } else if (message != null && session.getAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE) {
+            message.acknowledge();
         }
     }
+
+    public static void rollbackIfNeeded(Session session) throws JMSException {
+        if (session.getTransacted()) {
+            try {
+                session.rollback();
+            } catch (javax.jms.TransactionInProgressException | javax.jms.IllegalStateException ex) {
+                // ignore
+            }
+        } else if (session.getAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE) {
+            try {
+                session.recover();
+            } catch (javax.jms.IllegalStateException ex) {
+                // ignore
+            }
+        }
+    }
+
+    public static boolean isTransactionOrClientAcknowledgeMode(Session session) throws JMSException {
+        return session.getTransacted() || session.getAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE;
+    }
+
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
index 6bc7d80..57ee7ed 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
@@ -16,160 +16,521 @@
  */
 package org.apache.camel.component.sjms;
 
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import javax.jms.Connection;
-import javax.jms.DeliveryMode;
 import javax.jms.Destination;
 import javax.jms.JMSException;
+import javax.jms.Message;
 import javax.jms.Session;
 
 import org.apache.camel.AsyncCallback;
-import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
-import org.apache.camel.component.sjms.tx.SessionTransactionSynchronization;
+import org.apache.camel.ExtendedExchange;
+import org.apache.camel.FailedToCreateProducerException;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.RuntimeExchangeException;
+import org.apache.camel.component.sjms.jms.JmsMessageHelper;
+import org.apache.camel.component.sjms.jms.MessageCreator;
+import org.apache.camel.component.sjms.reply.QueueReplyManager;
+import org.apache.camel.component.sjms.reply.ReplyManager;
+import org.apache.camel.component.sjms.reply.TemporaryQueueReplyManager;
+import org.apache.camel.spi.UuidGenerator;
 import org.apache.camel.support.DefaultAsyncProducer;
+import org.apache.camel.support.SynchronizationAdapter;
+import org.apache.camel.support.service.ServiceHelper;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-/**
- * Base SjmsProducer class.
- */
-public abstract class SjmsProducer extends DefaultAsyncProducer {
 
-    protected SjmsTemplate template;
+import static org.apache.camel.component.sjms.SjmsHelper.*;
+import static org.apache.camel.component.sjms.jms.JmsMessageHelper.*;
+
+public class SjmsProducer extends DefaultAsyncProducer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(SjmsProducer.class);
+
+    private static final String GENERATED_CORRELATION_ID_PREFIX = "Camel-";
+    private final SjmsEndpoint endpoint;
+    private final AtomicBoolean started = new AtomicBoolean();
+    private SjmsTemplate inOnlyTemplate;
+    private SjmsTemplate inOutTemplate;
+    private UuidGenerator uuidGenerator;
+    private ReplyManager replyManager;
 
-    public SjmsProducer(Endpoint endpoint) {
+    public SjmsProducer(SjmsEndpoint endpoint) {
         super(endpoint);
+        this.endpoint = endpoint;
+    }
+
+    @Override
+    public SjmsEndpoint getEndpoint() {
+        return (SjmsEndpoint) super.getEndpoint();
     }
 
     @Override
     protected void doInit() throws Exception {
-        template = new SjmsTemplate(getEndpoint().getConnectionFactory(), isEndpointTransacted(), getAcknowledgeMode());
+        super.doInit();
+        if (uuidGenerator == null) {
+            // use the generator configured on the camel context
+            uuidGenerator = getEndpoint().getCamelContext().getUuidGenerator();
+        }
+    }
 
-        // configure qos if enabled
-        if (getEndpoint().isExplicitQosEnabled()) {
-            int dm = getEndpoint().isDeliveryPersistent() ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT;
-            if (getEndpoint().getDeliveryMode() != null) {
-                dm = getEndpoint().getDeliveryMode();
-            }
-            template.setQoSSettings(dm, getEndpoint().getPriority(), getEndpoint().getTimeToLive());
+    @Override
+    protected void doStart() throws Exception {
+        super.doStart();
+        if (endpoint.isTestConnectionOnStartup()) {
+            testConnectionOnStartup();
         }
     }
 
     @Override
-    public SjmsEndpoint getEndpoint() {
-        return (SjmsEndpoint) super.getEndpoint();
+    protected void doStop() throws Exception {
+        super.doStop();
+
+        // must stop/un-init reply manager if it was in use
+        unInitReplyManager();
+    }
+
+    protected void initReplyManager() {
+        if (!started.get()) {
+            synchronized (this) {
+                if (started.get()) {
+                    return;
+                }
+
+                // must use the classloader from the application context when creating reply manager,
+                // as it should inherit the classloader from app context and not the current which may be
+                // a different classloader
+                ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
+                ClassLoader ac = endpoint.getCamelContext().getApplicationContextClassLoader();
+                try {
+                    if (ac != null) {
+                        Thread.currentThread().setContextClassLoader(ac);
+                    }
+                    // validate that replyToType and replyTo is configured accordingly
+                    if (endpoint.getReplyToType() != null) {
+                        // setting temporary with a fixed replyTo is not supported
+                        if (endpoint.getReplyTo() != null && endpoint.getReplyToType().equals(ReplyToType.Temporary.name())) {
+                            throw new IllegalArgumentException(
+                                    "ReplyToType " + ReplyToType.Temporary
+                                                               + " is not supported when replyTo " + endpoint.getReplyTo()
+                                                               + " is also configured.");
+                        }
+                    }
+
+                    if (endpoint.getReplyTo() != null) {
+                        replyManager = createReplyManager(endpoint.getReplyTo());
+                        if (LOG.isDebugEnabled()) {
+                            LOG.debug("Using JmsReplyManager: {} to process replies from: {}", replyManager,
+                                    endpoint.getReplyTo());
+                        }
+                    } else {
+                        replyManager = createReplyManager();
+                        LOG.debug("Using JmsReplyManager: {} to process replies from temporary queue", replyManager);
+                    }
+                } catch (Exception e) {
+                    throw new FailedToCreateProducerException(endpoint, e);
+                } finally {
+                    Thread.currentThread().setContextClassLoader(oldClassLoader);
+                }
+                started.set(true);
+            }
+        }
+    }
+
+    protected void unInitReplyManager() {
+        try {
+            if (replyManager != null) {
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug("Stopping JmsReplyManager: {} from processing replies from: {}", replyManager,
+                            endpoint.getReplyTo() != null ? endpoint.getReplyTo() : "temporary queue");
+                }
+                ServiceHelper.stopService(replyManager);
+            }
+        } catch (Exception e) {
+            throw RuntimeCamelException.wrapRuntimeCamelException(e);
+        } finally {
+            started.set(false);
+        }
+    }
+
+    protected ReplyManager createReplyManager(String replyTo) throws Exception {
+        // use a regular queue
+        ReplyManager replyManager = new QueueReplyManager(getEndpoint().getCamelContext());
+        replyManager.setEndpoint(getEndpoint());
+
+        String name = "JmsReplyManagerTimeoutChecker[" + replyTo + "]";
+        ScheduledExecutorService replyManagerScheduledExecutorService
+                = getEndpoint().getCamelContext().getExecutorServiceManager().newSingleThreadScheduledExecutor(name, name);
+        replyManager.setScheduledExecutorService(replyManagerScheduledExecutorService);
+
+        name = "JmsReplyManagerOnTimeout[" + replyTo + "]";
+        // allow the timeout thread to timeout so during normal operation we do not have a idle thread
+        int max = getEndpoint().getComponent().getReplyToOnTimeoutMaxConcurrentConsumers();
+        if (max <= 0) {
+            throw new IllegalArgumentException("The option replyToOnTimeoutMaxConcurrentConsumers must be >= 1");
+        }
+        ExecutorService replyManagerExecutorService
+                = getEndpoint().getCamelContext().getExecutorServiceManager().newThreadPool(replyManager, name, 0, max);
+        replyManager.setOnTimeoutExecutorService(replyManagerExecutorService);
+
+        ServiceHelper.startService(replyManager);
+
+        return replyManager;
     }
 
-    protected Destination resolveDestinationName(Session session, String destinationName) throws JMSException {
-        return getEndpoint().getDestinationCreationStrategy().createDestination(session,
-                destinationName, getEndpoint().isTopic());
+    protected ReplyManager createReplyManager() throws Exception {
+        // use a temporary queue
+        ReplyManager replyManager = new TemporaryQueueReplyManager(getEndpoint().getCamelContext());
+        replyManager.setEndpoint(getEndpoint());
+
+        String name = "JmsReplyManagerTimeoutChecker[" + getEndpoint().getEndpointConfiguredDestinationName() + "]";
+        ScheduledExecutorService replyManagerScheduledExecutorService
+                = getEndpoint().getCamelContext().getExecutorServiceManager().newSingleThreadScheduledExecutor(name, name);
+        replyManager.setScheduledExecutorService(replyManagerScheduledExecutorService);
+
+        name = "JmsReplyManagerOnTimeout[" + getEndpoint().getEndpointConfiguredDestinationName() + "]";
+        // allow the timeout thread to timeout so during normal operation we do not have a idle thread
+        int max = getEndpoint().getComponent().getReplyToOnTimeoutMaxConcurrentConsumers();
+        if (max <= 0) {
+            throw new IllegalArgumentException("The option replyToOnTimeoutMaxConcurrentConsumers must be >= 1");
+        }
+        ExecutorService replyManagerExecutorService
+                = getEndpoint().getCamelContext().getExecutorServiceManager().newThreadPool(replyManager, name, 0, max);
+        replyManager.setOnTimeoutExecutorService(replyManagerExecutorService);
+
+        ServiceHelper.startService(replyManager);
+
+        return replyManager;
     }
 
-    protected abstract void sendMessage(Exchange exchange, Session sharedSession, String destinationName);
+    /**
+     * Pre tests the connection before starting the listening.
+     * <p/>
+     * In case of connection failure the exception is thrown which prevents Camel from starting.
+     *
+     * @throws FailedToCreateProducerException is thrown if testing the connection failed
+     */
+    protected void testConnectionOnStartup() throws FailedToCreateProducerException {
+        try {
+            SjmsTemplate template = getInOnlyTemplate();
+
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Testing JMS Connection on startup for destination: {}", getEndpoint().getDestinationName());
+            }
+
+            Connection conn = template.getConnectionFactory().createConnection();
+            SjmsHelper.closeConnection(conn);
+
+            LOG.debug("Successfully tested JMS Connection on startup for destination: {}",
+                    getEndpoint().getDestinationName());
+        } catch (Exception e) {
+            throw new FailedToCreateProducerException(getEndpoint(), e);
+        }
+    }
 
     @Override
-    public boolean process(final Exchange exchange, final AsyncCallback callback) {
-        String destinationName = exchange.getMessage().getHeader(SjmsConstants.JMS_DESTINATION_NAME, String.class);
-        if (destinationName != null) {
-            // remove the header so it wont be propagated
-            exchange.getMessage().removeHeader(SjmsConstants.JMS_DESTINATION_NAME);
+    public boolean process(Exchange exchange, AsyncCallback callback) {
+        // deny processing if we are not started
+        if (!isRunAllowed()) {
+            if (exchange.getException() == null) {
+                exchange.setException(new RejectedExecutionException());
+            }
+            // we cannot process so invoke callback
+            callback.done(true);
+            return true;
         }
 
-        return doProcess(exchange, callback, destinationName);
+        try {
+            if (!endpoint.isDisableReplyTo() && exchange.getPattern().isOutCapable()) {
+                // in out requires a bit more work than in only
+                return processInOut(exchange, callback);
+            } else {
+                // in only
+                return processInOnly(exchange, callback);
+            }
+        } catch (Throwable e) {
+            // must catch exception to ensure callback is invoked as expected
+            // to let Camel error handling deal with this
+            exchange.setException(e);
+            callback.done(true);
+            return true;
+        }
     }
 
-    protected boolean doProcess(Exchange exchange, AsyncCallback callback, String destinationName) {
+    protected boolean processInOut(final Exchange exchange, final AsyncCallback callback) {
+        final org.apache.camel.Message in = exchange.getIn();
+
+        String destinationName = in.getHeader(SjmsConstants.JMS_DESTINATION_NAME, String.class);
+        // remove the header so it wont be propagated
+        in.removeHeader(SjmsConstants.JMS_DESTINATION_NAME);
         if (destinationName == null) {
-            destinationName = getDestinationName();
+            destinationName = endpoint.getDestinationName();
+        }
+
+        initReplyManager();
+
+        // the request timeout can be overruled by a header otherwise the endpoint configured value is used
+        final long timeout
+                = exchange.getIn().getHeader(SjmsConstants.JMS_REQUEST_TIMEOUT, endpoint.getRequestTimeout(), long.class);
+
+        final String originalCorrelationId = in.getHeader("JMSCorrelationID", String.class);
+
+        boolean generateFreshCorrId = ObjectHelper.isEmpty(originalCorrelationId)
+                || originalCorrelationId.startsWith(GENERATED_CORRELATION_ID_PREFIX);
+        if (generateFreshCorrId) {
+            // we append the 'Camel-' prefix to know it was generated by us
+            in.setHeader("JMSCorrelationID", GENERATED_CORRELATION_ID_PREFIX + getUuidGenerator().generateUuid());
         }
+
+        MessageCreator messageCreator = new MessageCreator() {
+            public Message createMessage(Session session) throws JMSException {
+                Message answer = endpoint.getBinding().makeJmsMessage(exchange, in, session, null);
+
+                Destination replyTo;
+                String replyToOverride = endpoint.getReplyToOverride();
+                if (replyToOverride != null) {
+                    replyTo = resolveOrCreateDestination(replyToOverride, session);
+                } else {
+                    // get the reply to destination to be used from the reply manager
+                    replyTo = replyManager.getReplyTo();
+                }
+                if (replyTo == null) {
+                    throw new RuntimeExchangeException("Failed to resolve replyTo destination", exchange);
+                }
+                JmsMessageHelper.setJMSReplyTo(answer, replyTo);
+                replyManager.setReplyToSelectorHeader(in, answer);
+
+                String correlationId = determineCorrelationId(answer);
+                replyManager.registerReply(replyManager, exchange, callback, originalCorrelationId, correlationId, timeout);
+
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug("Using {}: {}, JMSReplyTo destination: {}, with request timeout: {} ms.",
+                            new Object[] { "JMSCorrelationID", correlationId, replyTo, timeout });
+                }
+
+                LOG.trace("Created javax.jms.Message: {}", answer);
+                return answer;
+            }
+        };
+
         try {
-            if (isEndpointTransacted()) {
-                Connection connection = null;
-                Session session = null;
-                boolean close = false;
-                if (isSharedJMSSession()) {
-                    session = exchange.getIn().getHeader(SjmsConstants.JMS_SESSION, Session.class);
+            doSend(true, destinationName, messageCreator);
+        } catch (Exception e) {
+            exchange.setException(e);
+            callback.done(true);
+            return true;
+        }
+
+        // continue routing asynchronously (reply will be processed async when its received)
+        return false;
+    }
+
+    protected boolean processInOnly(final Exchange exchange, final AsyncCallback callback) {
+        final org.apache.camel.Message in = exchange.getIn();
+
+        String destinationName = in.getHeader(SjmsConstants.JMS_DESTINATION_NAME, String.class);
+        if (destinationName != null) {
+            // remove the header so it wont be propagated
+            in.removeHeader(SjmsConstants.JMS_DESTINATION_NAME);
+        }
+        if (destinationName == null) {
+            destinationName = endpoint.getDestinationName();
+        }
+
+        final String to = destinationName;
+
+        MessageCreator messageCreator = new MessageCreator() {
+            public Message createMessage(Session session) throws JMSException {
+                Message answer = endpoint.getBinding().makeJmsMessage(exchange, in, session, null);
+
+                // when in InOnly mode the JMSReplyTo is a bit complicated
+                // we only want to set the JMSReplyTo on the answer if
+                // there is a JMSReplyTo from the header/endpoint and
+                // we have been told to preserveMessageQos
+
+                Object jmsReplyTo = JmsMessageHelper.getJMSReplyTo(answer);
+                if (endpoint.isDisableReplyTo()) {
+                    // honor disable reply to configuration
+                    LOG.trace("ReplyTo is disabled on endpoint: {}", endpoint);
+                    JmsMessageHelper.setJMSReplyTo(answer, null);
+                } else {
+                    // if the binding did not create the reply to then we have to try to create it here
+                    if (jmsReplyTo == null) {
+                        // prefer reply to from header over endpoint configured
+                        jmsReplyTo = exchange.getIn().getHeader("JMSReplyTo", String.class);
+                        if (jmsReplyTo == null) {
+                            jmsReplyTo = endpoint.getReplyTo();
+                        }
+                    }
                 }
-                if (session == null) {
-                    close = true;
-                    connection = template.createConnection();
-                    session = template.createSession(connection);
+
+                // we must honor these special flags to preserve QoS
+                // as we are not OUT capable and thus do not expect a reply, and therefore
+                // the consumer of this message should not return a reply so we remove it
+                // unless we use preserveMessageQos=true to tell that we still want to use JMSReplyTo
+                if (jmsReplyTo != null && !(endpoint.isPreserveMessageQos() || endpoint.isExplicitQosEnabled())) {
+                    // log at debug what we are doing, as higher level may cause noise in production logs
+                    // this behavior is also documented at the camel website
+                    if (LOG.isDebugEnabled()) {
+                        LOG.debug(
+                                "Disabling JMSReplyTo: {} for destination: {}. Use preserveMessageQos=true to force Camel to keep the JMSReplyTo on endpoint: {}",
+                                new Object[] { jmsReplyTo, to, endpoint });
+                    }
+                    jmsReplyTo = null;
                 }
-                exchange.getUnitOfWork().addSynchronization(
-                        new SessionTransactionSynchronization(connection, session, getCommitStrategy(), close));
-                sendMessage(exchange, session, destinationName);
-            } else {
-                sendMessage(exchange, null, destinationName);
+
+                // the reply to is a String, so we need to look up its Destination instance
+                // and if needed create the destination using the session if needed to
+                if (jmsReplyTo instanceof String) {
+                    String replyTo = (String) jmsReplyTo;
+                    // we need to null it as we use the String to resolve it as a Destination instance
+                    jmsReplyTo = resolveOrCreateDestination(replyTo, session);
+                }
+
+                // set the JMSReplyTo on the answer if we are to use it
+                Destination replyTo = null;
+                String replyToOverride = endpoint.getReplyToOverride();
+                if (replyToOverride != null) {
+                    replyTo = resolveOrCreateDestination(replyToOverride, session);
+                } else if (jmsReplyTo != null) {
+                    replyTo = (Destination) jmsReplyTo;
+                }
+                if (replyTo != null) {
+                    LOG.debug("Using JMSReplyTo destination: {}", replyTo);
+                    JmsMessageHelper.setJMSReplyTo(answer, replyTo);
+                } else {
+                    // do not use JMSReplyTo
+                    LOG.trace("Not using JMSReplyTo");
+                    JmsMessageHelper.setJMSReplyTo(answer, null);
+                }
+
+                // if transacted or client ack mode then add uow work to complete after exchange is done
+                if (isTransactionOrClientAcknowledgeMode(session)) {
+                    ExtendedExchange ecc = exchange.adapt(ExtendedExchange.class);
+                    TransactionOnCompletion toc = new TransactionOnCompletion(session, answer);
+                    if (!ecc.containsOnCompletion(toc)) {
+                        ecc.addOnCompletion(toc);
+                    }
+                }
+
+                LOG.trace("Created javax.jms.Message: {}", answer);
+                return answer;
             }
-        } catch (Throwable e) {
+        };
+
+        try {
+            doSend(false, destinationName, messageCreator);
+        } catch (Exception e) {
             exchange.setException(e);
+            callback.done(true);
+            return true;
         }
+
+        // after sending then set the OUT message id to the JMSMessageID so its identical
+        setMessageId(exchange);
+
+        // we are synchronous so return true
         callback.done(true);
         return true;
     }
 
-    /**
-     * Gets the acknowledgment mode for this instance of DestinationProducer.
-     */
-    public int getAcknowledgeMode() {
-        return getEndpoint().getAcknowledgementMode().intValue();
+    protected void setMessageId(Exchange exchange) {
+        if (exchange.hasOut()) {
+            SjmsMessage out = exchange.getOut(SjmsMessage.class);
+            try {
+                if (out != null && out.getJmsMessage() != null) {
+                    out.setMessageId(out.getJmsMessage().getJMSMessageID());
+                }
+            } catch (JMSException e) {
+                LOG.warn("Unable to retrieve JMSMessageID from outgoing JMS Message and set it into Camel's MessageId", e);
+            }
+        }
     }
 
-    /**
-     * Gets the synchronous value for this instance of DestinationProducer.
-     */
-    public boolean isSynchronous() {
-        return getEndpoint().isSynchronous();
+    public SjmsTemplate getInOnlyTemplate() {
+        if (inOnlyTemplate == null) {
+            inOnlyTemplate = endpoint.createInOnlyTemplate();
+        }
+        return inOnlyTemplate;
     }
 
-    /**
-     * Gets the replyTo for this instance of DestinationProducer.
-     */
-    public String getReplyTo() {
-        return getEndpoint().getReplyTo();
+    public void setInOnlyTemplate(SjmsTemplate inOnlyTemplate) {
+        this.inOnlyTemplate = inOnlyTemplate;
     }
 
-    /**
-     * Gets the destinationName for this instance of DestinationProducer.
-     */
-    public String getDestinationName() {
-        return getEndpoint().getDestinationName();
+    public SjmsTemplate getInOutTemplate() {
+        if (inOutTemplate == null) {
+            inOutTemplate = endpoint.createInOutTemplate();
+        }
+        return inOutTemplate;
     }
 
-    /**
-     * Test to verify if this endpoint is a JMS Topic or Queue.
-     */
-    public boolean isTopic() {
-        return getEndpoint().isTopic();
+    public void setInOutTemplate(SjmsTemplate inOutTemplate) {
+        this.inOutTemplate = inOutTemplate;
     }
 
-    /**
-     * Test to determine if this endpoint should use a JMS Transaction.
-     */
-    public boolean isEndpointTransacted() {
-        return getEndpoint().isTransacted();
+    public UuidGenerator getUuidGenerator() {
+        return uuidGenerator;
     }
 
-    /**
-     * Test to determine if this endpoint should share a JMS Session with other SJMS endpoints.
-     */
-    public boolean isSharedJMSSession() {
-        return getEndpoint().isSharedJMSSession();
+    public void setUuidGenerator(UuidGenerator uuidGenerator) {
+        this.uuidGenerator = uuidGenerator;
+    }
+
+    protected Destination resolveOrCreateDestination(String destinationName, Session session)
+            throws JMSException {
+
+        boolean isPubSub = isTopicPrefix(destinationName)
+                || (!isQueuePrefix(destinationName) && endpoint.isTopic());
+
+        // must normalize the destination name
+        String before = destinationName;
+        destinationName = normalizeDestinationName(destinationName);
+        LOG.trace("Normalized JMSReplyTo destination name {} -> {}", before, destinationName);
+
+        return endpoint.getDestinationCreationStrategy().createDestination(session, destinationName, isPubSub);
     }
 
     /**
-     * Gets consumerCount for this instance of SjmsProducer.
+     * Strategy to determine which correlation id to use among <tt>JMSMessageID</tt> and <tt>JMSCorrelationID</tt>.
+     *
+     * @param  message      the JMS message
+     * @throws JMSException can be thrown
      */
-    public int getConsumerCount() {
-        return getEndpoint().getConsumerCount();
+    protected String determineCorrelationId(Message message) throws JMSException {
+        String cid = getJMSCorrelationIDAsBytes(message);
+        if (ObjectHelper.isEmpty(cid)) {
+            cid = getJMSMessageID(message);
+        }
+        return cid;
     }
 
     /**
-     * Gets commitStrategy for this instance of SjmsProducer.
+     * Sends the message using the JmsTemplate.
+     *
+     * @param inOut           use inOut or inOnly template
+     * @param destinationName the destination
+     * @param messageCreator  the creator to create the {@link Message} to send
      */
-    protected TransactionCommitStrategy getCommitStrategy() {
-        if (isEndpointTransacted()) {
-            return getEndpoint().getTransactionCommitStrategy();
+    protected void doSend(
+            boolean inOut, String destinationName,
+            MessageCreator messageCreator)
+            throws Exception {
+
+        SjmsTemplate template = inOut ? getInOutTemplate() : getInOnlyTemplate();
+
+        if (LOG.isTraceEnabled()) {
+            LOG.trace("Using {} jms template", inOut ? "inOut" : "inOnly");
         }
-        return null;
+
+        template.send(destinationName, messageCreator, getEndpoint().isTopic());
     }
 
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java
index 902ce6e..f725b16 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsTemplate.java
@@ -18,17 +18,23 @@ package org.apache.camel.component.sjms;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
 import javax.jms.Message;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
+import org.apache.camel.component.sjms.jms.DestinationCreationStrategy;
+import org.apache.camel.component.sjms.jms.MessageCreator;
 import org.apache.camel.util.ObjectHelper;
 
+import static org.apache.camel.component.sjms.SjmsHelper.*;
+
 public class SjmsTemplate {
 
     private final ConnectionFactory connectionFactory;
     private final boolean transacted;
     private final int acknowledgeMode;
+    private DestinationCreationStrategy destinationCreationStrategy;
 
     private boolean explicitQosEnabled;
     private int deliveryMode = Message.DEFAULT_DELIVERY_MODE;
@@ -43,6 +49,14 @@ public class SjmsTemplate {
         this.acknowledgeMode = acknowledgeMode;
     }
 
+    public ConnectionFactory getConnectionFactory() {
+        return connectionFactory;
+    }
+
+    public void setDestinationCreationStrategy(DestinationCreationStrategy destinationCreationStrategy) {
+        this.destinationCreationStrategy = destinationCreationStrategy;
+    }
+
     public void setQoSSettings(int deliveryMode, int priority, long timeToLive) {
         if (deliveryMode != 0) {
             this.deliveryMode = deliveryMode;
@@ -70,8 +84,8 @@ public class SjmsTemplate {
             session = createSession(con);
             return sessionCallback.doInJms(session);
         } finally {
-            close(session);
-            close(con);
+            closeSession(session);
+            closeConnection(con);
         }
     }
 
@@ -83,6 +97,20 @@ public class SjmsTemplate {
         }
     }
 
+    public void send(String destinationName, MessageCreator messageCreator, boolean isTopic) throws Exception {
+        execute(session -> {
+            Destination dest = destinationCreationStrategy.createDestination(session, destinationName, isTopic);
+            Message message = messageCreator.createMessage(session);
+            MessageProducer producer = session.createProducer(dest);
+            try {
+                send(producer, message);
+            } finally {
+                closeProducer(producer);
+            }
+            return null;
+        });
+    }
+
     public void send(MessageProducer producer, Message message) throws Exception {
         if (explicitQosEnabled) {
             producer.send(message, deliveryMode, priority, timeToLive);
@@ -99,23 +127,4 @@ public class SjmsTemplate {
         return connection.createSession(transacted, acknowledgeMode);
     }
 
-    private static void close(Connection con) {
-        if (con != null) {
-            try {
-                con.close();
-            } catch (Throwable e) {
-                // ignore
-            }
-        }
-    }
-
-    private static void close(Session session) {
-        if (session != null) {
-            try {
-                session.close();
-            } catch (Throwable e) {
-                // ignore
-            }
-        }
-    }
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
new file mode 100644
index 0000000..3674cde
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms;
+
+import javax.jms.Message;
+import javax.jms.Session;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.support.SynchronizationAdapter;
+
+
+import static org.apache.camel.component.sjms.SjmsHelper.*;
+
+/**
+ * Completion {@link org.apache.camel.spi.Synchronization} work when
+ * processing the message is complete to either commit or rollback the session.
+ */
+class TransactionOnCompletion extends SynchronizationAdapter implements Comparable<TransactionOnCompletion> {
+
+    // TODO: close session, connection
+
+    private final Session session;
+    private final Message message;
+
+    public TransactionOnCompletion(Session session, Message message) {
+        this.session = session;
+        this.message = message;
+    }
+
+    @Override
+    public void onDone(Exchange exchange) {
+        try {
+            if (exchange.isFailed() || exchange.isRollbackOnly()) {
+                rollbackIfNeeded(session);
+            } else {
+                commitIfNeeded(session, message);
+            }
+        } catch (Throwable e) {
+            // ignore
+        } finally {
+            closeSession(session);
+        }
+    }
+
+    @Override
+    public int compareTo(TransactionOnCompletion o) {
+        // same session and message
+        if (session == o.session && message == o.message) {
+            return 0;
+        } else {
+            return -1;
+        }
+    }
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java
deleted file mode 100644
index 0eecf31..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.consumer;
-
-import java.util.concurrent.ExecutorService;
-
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.Session;
-
-import org.apache.camel.AsyncProcessor;
-import org.apache.camel.Exchange;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.component.sjms.SjmsConstants;
-import org.apache.camel.component.sjms.SjmsEndpoint;
-import org.apache.camel.spi.Synchronization;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.apache.camel.RuntimeCamelException.wrapRuntimeCamelException;
-
-/**
- * Abstract MessageListener
- */
-@Deprecated
-public abstract class AbstractMessageHandler implements MessageListener {
-
-    protected final Logger log = LoggerFactory.getLogger(getClass());
-
-    private final ExecutorService executor;
-
-    private SjmsEndpoint endpoint;
-    private AsyncProcessor processor;
-    private Session session;
-    private boolean transacted;
-    private boolean sharedJMSSession;
-    private boolean synchronous = true;
-    private final Synchronization synchronization;
-    private boolean topic;
-
-    public AbstractMessageHandler(SjmsEndpoint endpoint, ExecutorService executor) {
-        this(endpoint, executor, null);
-    }
-
-    public AbstractMessageHandler(SjmsEndpoint endpoint, ExecutorService executor, Synchronization synchronization) {
-        this.synchronization = synchronization;
-        this.endpoint = endpoint;
-        this.executor = executor;
-    }
-
-    @Override
-    public void onMessage(Message message) {
-        RuntimeCamelException rce = null;
-        try {
-            final Exchange exchange = getEndpoint().createExchange(message, getSession());
-
-            log.debug("Processing ExchangeId: {}", exchange.getExchangeId());
-
-            if (isTransacted()) {
-                if (isSharedJMSSession()) {
-                    // Propagate a JMS Session as an initiator if sharedJMSSession is enabled
-                    exchange.getIn().setHeader(SjmsConstants.JMS_SESSION, getSession());
-                }
-            }
-            try {
-                if (isTransacted() || isSynchronous()) {
-                    log.debug("Handling synchronous message: {}", exchange.getIn().getBody());
-                    handleMessage(exchange);
-                    if (exchange.isFailed()) {
-                        synchronization.onFailure(exchange);
-                    } else {
-                        synchronization.onComplete(exchange);
-                    }
-                } else {
-                    log.debug("Handling asynchronous message: {}", exchange.getIn().getBody());
-                    executor.execute(new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                handleMessage(exchange);
-                            } catch (Exception e) {
-                                exchange.setException(e);
-                            }
-                        }
-                    });
-                }
-            } catch (Exception e) {
-                if (exchange.getException() == null) {
-                    exchange.setException(e);
-                } else {
-                    throw e;
-                }
-            }
-        } catch (Exception e) {
-            rce = wrapRuntimeCamelException(e);
-        } finally {
-            if (rce != null) {
-                throw rce;
-            }
-        }
-    }
-
-    public abstract void handleMessage(Exchange exchange);
-
-    /**
-     * Method will be called to
-     */
-    public abstract void close();
-
-    public void setTransacted(boolean transacted) {
-        this.transacted = transacted;
-    }
-
-    public boolean isTransacted() {
-        return transacted;
-    }
-
-    public void setSharedJMSSession(boolean share) {
-        this.sharedJMSSession = share;
-    }
-
-    public boolean isSharedJMSSession() {
-        return sharedJMSSession;
-    }
-
-    public SjmsEndpoint getEndpoint() {
-        return endpoint;
-    }
-
-    public AsyncProcessor getProcessor() {
-        return processor;
-    }
-
-    public void setProcessor(AsyncProcessor processor) {
-        this.processor = processor;
-    }
-
-    public void setSession(Session session) {
-        this.session = session;
-    }
-
-    public Session getSession() {
-        return session;
-    }
-
-    public void setSynchronous(boolean async) {
-        this.synchronous = async;
-    }
-
-    public boolean isSynchronous() {
-        return synchronous;
-    }
-
-    public void setTopic(boolean topic) {
-        this.topic = topic;
-    }
-
-    public boolean isTopic() {
-        return topic;
-    }
-
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java
deleted file mode 100644
index 0d9db8c..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.consumer;
-
-import java.util.concurrent.ExecutorService;
-
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.Exchange;
-import org.apache.camel.component.sjms.SjmsEndpoint;
-import org.apache.camel.spi.Synchronization;
-
-/**
- * An InOnly {@link AbstractMessageHandler}
- */
-@Deprecated
-public class InOnlyMessageHandler extends AbstractMessageHandler {
-
-    public InOnlyMessageHandler(SjmsEndpoint endpoint, ExecutorService executor) {
-        super(endpoint, executor);
-    }
-
-    public InOnlyMessageHandler(SjmsEndpoint endpoint, ExecutorService executor, Synchronization synchronization) {
-        super(endpoint, executor, synchronization);
-    }
-
-    @Override
-    public void handleMessage(final Exchange exchange) {
-        if (log.isDebugEnabled()) {
-            log.debug("Handling InOnly Message: {}", exchange.getIn().getBody());
-        }
-        if (!exchange.isFailed()) {
-            NoOpAsyncCallback callback = new NoOpAsyncCallback();
-            if (isTransacted() || isSynchronous()) {
-                // must process synchronous if transacted or configured to do so
-                if (log.isDebugEnabled()) {
-                    log.debug("Synchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(),
-                            getEndpoint().getEndpointUri());
-                }
-                try {
-                    getProcessor().process(exchange);
-                } catch (Exception e) {
-                    exchange.setException(e);
-                } finally {
-                    callback.done(true);
-                }
-            } else {
-                // process asynchronous using the async routing engine
-                if (log.isDebugEnabled()) {
-                    log.debug("Asynchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(),
-                            getEndpoint().getEndpointUri());
-                }
-
-                getProcessor().process(exchange, callback);
-            }
-        }
-    }
-
-    @Override
-    public void close() {
-        // no-op
-    }
-
-    protected class NoOpAsyncCallback implements AsyncCallback {
-
-        public NoOpAsyncCallback() {
-        }
-
-        @Override
-        public void done(boolean sync) {
-            log.debug("NoOpAsyncCallback InOnly Exchange complete");
-        }
-    }
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java
deleted file mode 100644
index d964be1..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.consumer;
-
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Topic;
-
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.Exchange;
-import org.apache.camel.component.sjms.SjmsEndpoint;
-import org.apache.camel.component.sjms.jms.JmsConstants;
-import org.apache.camel.spi.Synchronization;
-
-/**
- * cache manager to store and purge unused cashed producers or we will have a memory leak
- */
-@Deprecated
-public class InOutMessageHandler extends AbstractMessageHandler {
-
-    private Map<String, MessageProducer> producerCache = new TreeMap<>();
-    private ReadWriteLock lock = new ReentrantReadWriteLock();
-
-    public InOutMessageHandler(SjmsEndpoint endpoint, ExecutorService executor) {
-        super(endpoint, executor);
-    }
-
-    public InOutMessageHandler(SjmsEndpoint endpoint, ExecutorService executor, Synchronization synchronization) {
-        super(endpoint, executor, synchronization);
-    }
-
-    @Override
-    public void handleMessage(final Exchange exchange) {
-        try {
-            MessageProducer messageProducer = null;
-            Object obj = exchange.getIn().getHeader(JmsConstants.JMS_REPLY_TO);
-            if (obj != null) {
-                Destination replyTo;
-                if (isDestination(obj)) {
-                    replyTo = (Destination) obj;
-                } else if (obj instanceof String) {
-                    replyTo = getEndpoint().getDestinationCreationStrategy().createDestination(getSession(), (String) obj,
-                            isTopic());
-                } else {
-                    throw new Exception(
-                            "The value of JMSReplyTo must be a valid Destination or String.  Value provided: " + obj);
-                }
-
-                String destinationName = getDestinationName(replyTo);
-                try {
-                    lock.readLock().lock();
-                    if (producerCache.containsKey(destinationName)) {
-                        messageProducer = producerCache.get(destinationName);
-                    }
-                } finally {
-                    lock.readLock().unlock();
-                }
-                if (messageProducer == null) {
-                    try {
-                        lock.writeLock().lock();
-                        messageProducer = getSession().createProducer(replyTo);
-                        producerCache.put(destinationName, messageProducer);
-                    } finally {
-                        lock.writeLock().unlock();
-                    }
-                }
-            }
-
-            MessageHandlerAsyncCallback callback = new MessageHandlerAsyncCallback(exchange, messageProducer);
-            if (exchange.isFailed()) {
-                return;
-            } else {
-                if (isTransacted() || isSynchronous()) {
-                    // must process synchronous if transacted or configured to do so
-                    log.debug("Synchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(),
-                            getEndpoint().getEndpointUri());
-                    try {
-                        getProcessor().process(exchange);
-                    } catch (Exception e) {
-                        exchange.setException(e);
-                    } finally {
-                        callback.done(true);
-                    }
-                } else {
-                    // process asynchronous using the async routing engine
-                    if (log.isDebugEnabled()) {
-                        log.debug("Asynchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(),
-                                getEndpoint().getEndpointUri());
-                    }
-                    getProcessor().process(exchange, callback);
-                }
-            }
-        } catch (Exception e) {
-            exchange.setException(e);
-        }
-
-        if (log.isDebugEnabled()) {
-            log.debug("SjmsMessageConsumer invoked for Exchange id:{}", exchange.getExchangeId());
-        }
-    }
-
-    @Override
-    public void close() {
-        for (final Map.Entry<String, MessageProducer> entry : producerCache.entrySet()) {
-            try {
-                entry.getValue().close();
-            } catch (JMSException e) {
-                log.debug("Cached MessageProducer with key: {} threw an unexpected exception. This exception is ignored.",
-                        entry.getKey(), e);
-            }
-        }
-        producerCache.clear();
-    }
-
-    private boolean isDestination(Object object) {
-        return object instanceof Destination;
-    }
-
-    private String getDestinationName(Destination destination) throws Exception {
-        String answer = null;
-        if (destination instanceof Queue) {
-            answer = ((Queue) destination).getQueueName();
-        } else if (destination instanceof Topic) {
-            answer = ((Topic) destination).getTopicName();
-        }
-
-        return answer;
-    }
-
-    protected class MessageHandlerAsyncCallback implements AsyncCallback {
-
-        private final Exchange exchange;
-        private final MessageProducer localProducer;
-
-        public MessageHandlerAsyncCallback(Exchange exchange, MessageProducer localProducer) {
-            this.exchange = exchange;
-            this.localProducer = localProducer;
-        }
-
-        @Override
-        public void done(boolean sync) {
-            try {
-                org.apache.camel.Message msg = exchange.getMessage();
-                Message response = getEndpoint().getBinding().makeJmsMessage(exchange, msg, getSession(), null);
-                response.setJMSCorrelationID(exchange.getIn().getHeader(JmsConstants.JMS_CORRELATION_ID, String.class));
-                localProducer.send(response);
-            } catch (Exception e) {
-                exchange.setException(e);
-            }
-        }
-    }
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java
index e5ee4b2..c2cb3cb 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java
@@ -32,7 +32,7 @@ import javax.jms.Session;
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.sjms.SessionMessageListener;
 import org.apache.camel.component.sjms.SjmsEndpoint;
-import org.apache.camel.component.sjms.SjmsHelper;
+import org.apache.camel.component.sjms.jms.DestinationCreationStrategy;
 import org.apache.camel.support.service.ServiceSupport;
 import org.apache.camel.util.backoff.BackOff;
 import org.apache.camel.util.backoff.BackOffTimer;
@@ -48,10 +48,11 @@ public class SimpleMessageListenerContainer extends ServiceSupport
 
     private final SjmsEndpoint endpoint;
     private SessionMessageListener messageListener;
-
-    // TODO: transaction
-    // TODO: Add concurrency later
+    private String clientId;
     private int concurrentConsumers = 1;
+    private ExceptionListener exceptionListener;
+    private String destinationName;
+    private DestinationCreationStrategy destinationCreationStrategy;
 
     private final Object connectionLock = new Object();
     private Connection connection;
@@ -59,7 +60,6 @@ public class SimpleMessageListenerContainer extends ServiceSupport
     private final Object consumerLock = new Object();
     private Set<MessageConsumer> consumers;
     private Set<Session> sessions;
-
     private BackOffTimer.Task recoverTask;
     private ScheduledExecutorService scheduler;
 
@@ -67,10 +67,50 @@ public class SimpleMessageListenerContainer extends ServiceSupport
         this.endpoint = endpoint;
     }
 
+    public SjmsEndpoint getEndpoint() {
+        return endpoint;
+    }
+
     public void setMessageListener(SessionMessageListener messageListener) {
         this.messageListener = messageListener;
     }
 
+    public void setExceptionListener(ExceptionListener exceptionListener) {
+        this.exceptionListener = exceptionListener;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public String getDestinationName() {
+        return destinationName;
+    }
+
+    public void setDestinationName(String destinationName) {
+        this.destinationName = destinationName;
+    }
+
+    public DestinationCreationStrategy getDestinationCreationStrategy() {
+        return destinationCreationStrategy;
+    }
+
+    public void setDestinationCreationStrategy(DestinationCreationStrategy destinationCreationStrategy) {
+        this.destinationCreationStrategy = destinationCreationStrategy;
+    }
+
+    public int getConcurrentConsumers() {
+        return concurrentConsumers;
+    }
+
+    public void setConcurrentConsumers(int concurrentConsumers) {
+        this.concurrentConsumers = concurrentConsumers;
+    }
+
     @Override
     public void afterPropertiesConfigured(CamelContext camelContext) {
         // noop
@@ -122,26 +162,17 @@ public class SimpleMessageListenerContainer extends ServiceSupport
             commitIfNeeded(session, message);
         }
 
-        protected void commitIfNeeded(Session session, Message message) throws Exception {
-            if (session.getTransacted()) {
-                SjmsHelper.commitIfNecessary(session);
-            } else if (message != null && session.getAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE) {
-                message.acknowledge();
-            }
-        }
-
-        protected void rollbackIfNeeded(Session session) throws JMSException {
-            if (session.getTransacted()) {
-                SjmsHelper.rollbackIfNecessary(session);
-            } else if (session.getAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE) {
-                session.recover();
-            }
-        }
-
     }
 
     @Override
     public void onException(JMSException exception) {
+        if (exceptionListener != null) {
+            try {
+                exceptionListener.onException(exception);
+            } catch (Throwable e) {
+                // ignore
+            }
+        }
         if (endpoint.getExceptionListener() != null) {
             try {
                 endpoint.getExceptionListener().onException(exception);
@@ -211,12 +242,14 @@ public class SimpleMessageListenerContainer extends ServiceSupport
     protected void initConsumers() throws Exception {
         synchronized (this.consumerLock) {
             if (consumers == null) {
+                LOG.debug("Initializing {} concurrent consumers as JMS listener on destination: {}", concurrentConsumers,
+                        destinationName);
                 sessions = new HashSet<>(concurrentConsumers);
                 consumers = new HashSet<>(concurrentConsumers);
                 for (int i = 0; i < this.concurrentConsumers; i++) {
                     Session session
                             = connection.createSession(endpoint.isTransacted(), endpoint.getAcknowledgementMode().intValue());
-                    MessageConsumer consumer = endpoint.getJmsObjectFactory().createMessageConsumer(session, endpoint);
+                    MessageConsumer consumer = createMessageConsumer(session);
                     configureConsumer(consumer, session);
                     sessions.add(session);
                     consumers.add(consumer);
@@ -225,6 +258,10 @@ public class SimpleMessageListenerContainer extends ServiceSupport
         }
     }
 
+    protected MessageConsumer createMessageConsumer(Session session) throws Exception {
+        return endpoint.getJmsObjectFactory().createMessageConsumer(session, endpoint);
+    }
+
     protected void stopConsumers() throws Exception {
         synchronized (this.consumerLock) {
             if (consumers != null) {
@@ -248,8 +285,9 @@ public class SimpleMessageListenerContainer extends ServiceSupport
                 Connection con = null;
                 try {
                     con = endpoint.getConnectionFactory().createConnection();
-                    if (endpoint.getComponent().getConnectionClientId() != null) {
-                        con.setClientID(endpoint.getComponent().getConnectionClientId());
+                    String cid = clientId != null ? clientId : endpoint.getComponent().getClientId();
+                    if (cid != null) {
+                        con.setClientID(cid);
                     }
                     con.setExceptionListener(this);
                 } catch (JMSException e) {
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResource.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResource.java
deleted file mode 100644
index 043b708..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResource.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.jms;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.ExceptionListener;
-
-import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.pool.BasePoolableObjectFactory;
-import org.apache.commons.pool.impl.GenericObjectPool;
-
-/**
- * The default {@link ConnectionResource} implementation for the SJMSComponent.
- */
-@Deprecated
-public class ConnectionFactoryResource extends BasePoolableObjectFactory<Connection> implements ConnectionResource {
-
-    private static final long DEFAULT_WAIT_TIMEOUT = 5 * 1000;
-    private static final int DEFAULT_POOL_SIZE = 1;
-    private GenericObjectPool<Connection> connections;
-    private ConnectionFactory connectionFactory;
-    private String username;
-    private String password;
-    private String clientId;
-    private ExceptionListener exceptionListener;
-
-    /**
-     * Default Constructor
-     */
-    public ConnectionFactoryResource() {
-        this(DEFAULT_POOL_SIZE, null);
-    }
-
-    public ConnectionFactoryResource(int poolSize, ConnectionFactory connectionFactory) {
-        this(poolSize, connectionFactory, null, null);
-    }
-
-    public ConnectionFactoryResource(int poolSize, ConnectionFactory connectionFactory, String username, String password) {
-        this(poolSize, connectionFactory, username, password, null);
-    }
-
-    public ConnectionFactoryResource(int poolSize, ConnectionFactory connectionFactory, String username, String password,
-                                     String connectionId) {
-        this(poolSize, connectionFactory, username, password, connectionId, DEFAULT_WAIT_TIMEOUT);
-    }
-
-    public ConnectionFactoryResource(int poolSize, ConnectionFactory connectionFactory, String username, String password,
-                                     String connectionId, long maxWait) {
-        this(poolSize, connectionFactory, username, password, connectionId, DEFAULT_WAIT_TIMEOUT, true);
-    }
-
-    public ConnectionFactoryResource(int poolSize, ConnectionFactory connectionFactory, String username, String password,
-                                     String connectionId,
-                                     long maxWait, boolean testOnBorrow) {
-        this.connectionFactory = connectionFactory;
-        this.username = username;
-        this.password = password;
-        this.clientId = connectionId;
-        this.connections = new GenericObjectPool<>(this);
-        this.connections.setMaxWait(maxWait);
-        this.connections.setMaxActive(poolSize);
-        this.connections.setMaxIdle(poolSize);
-        this.connections.setMinIdle(poolSize);
-        this.connections.setLifo(false);
-        this.connections.setTestOnBorrow(testOnBorrow);
-    }
-
-    @Override
-    public boolean validateObject(Connection connection) {
-        try {
-            // ensure connection works so we need to start it
-            connection.start();
-            return true;
-        } catch (Throwable e) {
-            // ignore
-        }
-
-        return false;
-    }
-
-    @Override
-    public Connection borrowConnection() throws Exception {
-        return connections.borrowObject();
-    }
-
-    @Override
-    public void returnConnection(Connection connection) throws Exception {
-        connections.returnObject(connection);
-    }
-
-    @Override
-    public Connection makeObject() throws Exception {
-        Connection connection = null;
-        if (connectionFactory != null) {
-            if (getUsername() != null && getPassword() != null) {
-                connection = connectionFactory.createConnection(getUsername(), getPassword());
-            } else {
-                connection = connectionFactory.createConnection();
-            }
-        }
-        if (connection != null) {
-            if (ObjectHelper.isNotEmpty(getClientId())) {
-                connection.setClientID(getClientId());
-            }
-            // we want to listen for exceptions
-            if (exceptionListener != null) {
-                connection.setExceptionListener(exceptionListener);
-            }
-            connection.start();
-        }
-        return connection;
-    }
-
-    @Override
-    public void destroyObject(Connection connection) throws Exception {
-        if (connection != null) {
-            connection.stop();
-            connection.close();
-        }
-    }
-
-    public ConnectionFactory getConnectionFactory() {
-        return connectionFactory;
-    }
-
-    public void setConnectionFactory(ConnectionFactory connectionFactory) {
-        this.connectionFactory = connectionFactory;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    public ExceptionListener getExceptionListener() {
-        return exceptionListener;
-    }
-
-    public void setExceptionListener(ExceptionListener exceptionListener) {
-        this.exceptionListener = exceptionListener;
-    }
-
-    public int size() {
-        return connections.getNumActive() + connections.getNumIdle();
-    }
-
-    public void fillPool() throws Exception {
-        while (connections.getNumIdle() < connections.getMaxIdle()) {
-            connections.addObject();
-        }
-    }
-
-    public void drainPool() throws Exception {
-        connections.close();
-    }
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionResource.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionResource.java
deleted file mode 100644
index 9b63ef9..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionResource.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.jms;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-
-/**
- * <p>
- * The ConnectionResource is the contract used to provide {@link Connection} pools to the SJMS component. A user should
- * use this to provide access to an alternative pooled connection resource such as a {@link Connection} pool that is
- * managed by a J2EE container.
- * </p>
- * <p>
- * It is recommended though that for standard {@link ConnectionFactory} providers you use the
- * {@link ConnectionFactoryResource) implementation that is provided with SJMS as it is optimized for this component.
- * </p>
- */
-@Deprecated
-public interface ConnectionResource {
-
-    /**
-     * Borrows a {@link Connection} from the connection pool. An exception should be thrown if no resource is available.
-     *
-     * @return           {@link Connection}
-     * @throws Exception when no resource is available
-     */
-    Connection borrowConnection() throws Exception;
-
-    /**
-     * Returns the {@link Connection} to the connection pool.
-     *
-     * @param connection the borrowed {@link Connection}
-     */
-    void returnConnection(Connection connection) throws Exception;
-
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java
index 699db13..3bc7d69 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/Jms11ObjectFactory.java
@@ -43,6 +43,11 @@ public class Jms11ObjectFactory implements JmsObjectFactory {
     }
 
     @Override
+    public MessageConsumer createQueueMessageConsumer(Session session, Destination destination) throws Exception {
+        return createMessageConsumer(session, destination, null, false, null, false, false);
+    }
+
+    @Override
     public MessageConsumer createMessageConsumer(
             Session session,
             Destination destination,
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsObjectFactory.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsObjectFactory.java
index 056f676..014b478 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsObjectFactory.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsObjectFactory.java
@@ -26,6 +26,8 @@ import org.apache.camel.Endpoint;
 public interface JmsObjectFactory {
     MessageConsumer createMessageConsumer(Session session, Endpoint endpoint) throws Exception;
 
+    MessageConsumer createQueueMessageConsumer(Session session, Destination destination) throws Exception;
+
     MessageConsumer createMessageConsumer(
             Session session, Destination destination,
             String messageSelector, boolean topic, String subscriptionId, boolean durable,
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageListenerContainer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/MessageCreator.java
similarity index 68%
copy from components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageListenerContainer.java
copy to components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/MessageCreator.java
index e85772a..63cd955 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageListenerContainer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/MessageCreator.java
@@ -14,17 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.sjms;
+package org.apache.camel.component.sjms.jms;
 
-import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
 
-import org.apache.camel.AfterPropertiesConfigured;
-import org.apache.camel.Service;
+@FunctionalInterface
+public interface MessageCreator {
 
-public interface MessageListenerContainer extends Service, AfterPropertiesConfigured {
-
-    ConnectionFactory getConnectionFactory();
-
-    void setMessageListener(SessionMessageListener messageListener);
+    Message createMessage(Session session) throws JMSException;
 
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
deleted file mode 100644
index b21ce9e..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.producer;
-
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-
-import org.apache.camel.CamelExchangeException;
-import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
-import org.apache.camel.component.sjms.SjmsProducer;
-import org.apache.camel.component.sjms.TransactionCommitStrategy;
-import org.apache.camel.component.sjms.jms.JmsMessageHelper;
-import org.apache.camel.component.sjms.tx.DefaultTransactionCommitStrategy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.apache.camel.component.sjms.SjmsHelper.closeProducer;
-import static org.apache.camel.component.sjms.jms.JmsMessageHelper.isTopicPrefix;
-
-/**
- * A Camel Producer that provides the InOnly Exchange pattern.
- */
-public class InOnlyProducer extends SjmsProducer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(InOnlyProducer.class);
-
-    public InOnlyProducer(final Endpoint endpoint) {
-        super(endpoint);
-    }
-
-    @Override
-    protected TransactionCommitStrategy getCommitStrategy() {
-        if (isEndpointTransacted()) {
-            return super.getCommitStrategy() == null ? new DefaultTransactionCommitStrategy() : super.getCommitStrategy();
-        }
-        return null;
-    }
-
-    @Override
-    protected void sendMessage(Exchange exchange, Session session, String destinationName) {
-        try {
-            template.execute(session, sc -> {
-                MessageProducer producer = null;
-                try {
-                    Message answer = getEndpoint().getBinding().makeJmsMessage(exchange, sc);
-
-                    // when in InOnly mode the JMSReplyTo is a bit complicated
-                    // we only want to set the JMSReplyTo on the answer if
-                    // there is a JMSReplyTo from the header/endpoint and
-                    // we have been told to preserveMessageQos
-
-                    Object jmsReplyTo = JmsMessageHelper.getJMSReplyTo(answer);
-                    if (getEndpoint().isDisableReplyTo()) {
-                        // honor disable reply to configuration
-                        LOG.trace("ReplyTo is disabled on endpoint: {}", getEndpoint());
-                        JmsMessageHelper.setJMSReplyTo(answer, null);
-                    } else {
-                        // if the binding did not create the reply to then we have to try to create it here
-                        if (jmsReplyTo == null) {
-                            // prefer reply to from header over endpoint configured
-                            jmsReplyTo = exchange.getIn().getHeader("JMSReplyTo", String.class);
-                            if (jmsReplyTo == null) {
-                                jmsReplyTo = getEndpoint().getReplyTo();
-                            }
-                        }
-                    }
-
-                    // we must honor these special flags to preserve QoS
-                    // as we are not OUT capable and thus do not expect a reply, and therefore
-                    // the consumer of this message should not return a reply so we remove it
-                    // unless we use preserveMessageQos=true to tell that we still want to use JMSReplyTo
-                    if (jmsReplyTo != null && !(getEndpoint().isPreserveMessageQos() || getEndpoint().isExplicitQosEnabled())) {
-                        // log at debug what we are doing, as higher level may cause noise in production logs
-                        // this behavior is also documented at the camel website
-                        if (LOG.isDebugEnabled()) {
-                            LOG.debug(
-                                    "Disabling JMSReplyTo: {} for destination: {}. Use preserveMessageQos=true to force Camel to keep the JMSReplyTo on endpoint: {}",
-                                    new Object[] { jmsReplyTo, destinationName, getEndpoint() });
-                        }
-                        jmsReplyTo = null;
-                    }
-
-                    // the reply to is a String, so we need to look up its Destination instance
-                    // and if needed create the destination using the session if needed to
-                    if (jmsReplyTo instanceof String) {
-                        String replyTo = (String) jmsReplyTo;
-                        // we need to null it as we use the String to resolve it as a Destination instance
-                        jmsReplyTo = resolveOrCreateDestination(replyTo, sc);
-                    }
-
-                    // set the JMSReplyTo on the answer if we are to use it
-                    Destination replyTo = null;
-                    String replyToOverride = getEndpoint().getReplyToOverride();
-                    if (replyToOverride != null) {
-                        replyTo = resolveOrCreateDestination(replyToOverride, sc);
-                    } else if (jmsReplyTo instanceof Destination) {
-                        replyTo = (Destination) jmsReplyTo;
-                    }
-                    if (replyTo != null) {
-                        LOG.debug("Using JMSReplyTo destination: {}", replyTo);
-                        JmsMessageHelper.setJMSReplyTo(answer, replyTo);
-                    } else {
-                        // do not use JMSReplyTo
-                        LOG.trace("Not using JMSReplyTo");
-                        JmsMessageHelper.setJMSReplyTo(answer, null);
-                    }
-
-                    producer = getEndpoint().getJmsObjectFactory().createMessageProducer(sc, getEndpoint(), destinationName);
-                    template.send(producer, answer);
-                } finally {
-                    closeProducer(producer);
-                }
-                return null;
-            });
-        } catch (Exception e) {
-            exchange.setException(new CamelExchangeException("Unable to complete sending the JMS message", exchange, e));
-        }
-    }
-
-    protected Destination resolveOrCreateDestination(String destinationName, Session session)
-            throws JMSException {
-        boolean isPubSub = isTopicPrefix(destinationName)
-                || (!JmsMessageHelper.isQueuePrefix(destinationName) && getEndpoint().isTopic());
-        return getEndpoint().getDestinationCreationStrategy().createDestination(session, destinationName, isPubSub);
-    }
-
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
deleted file mode 100644
index 426ae90..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.producer;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Exchanger;
-import java.util.concurrent.TimeUnit;
-
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-
-import org.apache.camel.CamelException;
-import org.apache.camel.CamelExchangeException;
-import org.apache.camel.Exchange;
-import org.apache.camel.component.sjms.MessageConsumerResources;
-import org.apache.camel.component.sjms.SjmsConstants;
-import org.apache.camel.component.sjms.SjmsEndpoint;
-import org.apache.camel.component.sjms.SjmsMessage;
-import org.apache.camel.component.sjms.SjmsProducer;
-import org.apache.camel.component.sjms.jms.ConnectionResource;
-import org.apache.camel.component.sjms.jms.DestinationNameParser;
-import org.apache.camel.component.sjms.jms.JmsConstants;
-import org.apache.camel.component.sjms.jms.JmsMessageHelper;
-import org.apache.camel.spi.UuidGenerator;
-import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.pool.BasePoolableObjectFactory;
-import org.apache.commons.pool.impl.GenericObjectPool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.apache.camel.component.sjms.SjmsHelper.closeProducer;
-
-/**
- * A Camel Producer that provides the InOut Exchange pattern.
- */
-public class InOutProducer extends SjmsProducer {
-
-    // TODO: reply manager
-
-    private static final Logger LOG = LoggerFactory.getLogger(InOutProducer.class);
-
-    private static final Map<String, Exchanger<Object>> EXCHANGERS = new ConcurrentHashMap<>();
-
-    private static final String GENERATED_CORRELATION_ID_PREFIX = "Camel-";
-    private UuidGenerator uuidGenerator;
-    private GenericObjectPool<MessageConsumerResources> consumers;
-
-    public InOutProducer(final SjmsEndpoint endpoint) {
-        super(endpoint);
-    }
-
-    public UuidGenerator getUuidGenerator() {
-        return uuidGenerator;
-    }
-
-    public void setUuidGenerator(UuidGenerator uuidGenerator) {
-        this.uuidGenerator = uuidGenerator;
-    }
-
-    @Deprecated
-    protected ConnectionResource getOrCreateConnectionResource() {
-        ConnectionResource answer = getEndpoint().getConnectionResource();
-        if (answer == null) {
-            answer = getEndpoint().createConnectionResource(this);
-        }
-        return answer;
-    }
-
-    /**
-     * A pool of {@link MessageConsumerResources} objects that are the reply consumers.
-     */
-    @Deprecated
-    protected class MessageConsumerResourcesFactory extends BasePoolableObjectFactory<MessageConsumerResources> {
-
-        @Override
-        public MessageConsumerResources makeObject() throws Exception {
-            MessageConsumerResources answer;
-            ConnectionResource connectionResource = getOrCreateConnectionResource();
-            Connection conn = connectionResource.borrowConnection();
-            try {
-                Session session;
-                if (isEndpointTransacted()) {
-                    session = conn.createSession(true, Session.SESSION_TRANSACTED);
-                } else {
-                    session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-                }
-
-                Destination replyToDestination;
-                boolean isReplyToTopic;
-                if (ObjectHelper.isEmpty(getReplyTo())) {
-                    isReplyToTopic = isTopic();
-                    replyToDestination = getEndpoint().getDestinationCreationStrategy().createTemporaryDestination(session,
-                            isReplyToTopic);
-                } else {
-                    isReplyToTopic = DestinationNameParser.isReplyToTopic(getReplyTo(), isTopic());
-                    replyToDestination = getEndpoint().getDestinationCreationStrategy().createDestination(session,
-                            getReplyTo(), isReplyToTopic);
-                }
-                MessageConsumer messageConsumer = getEndpoint().getJmsObjectFactory().createMessageConsumer(session,
-                        replyToDestination, null, isReplyToTopic, null, true, false, false);
-                messageConsumer.setMessageListener(new MessageListener() {
-                    @Override
-                    public void onMessage(final Message message) {
-                        LOG.debug("Message Received in the Consumer Pool");
-                        LOG.debug("  Message : {}", message);
-                        try {
-                            String correlationID = message.getJMSCorrelationID();
-                            Exchanger<Object> exchanger = EXCHANGERS.get(correlationID);
-                            if (exchanger != null) {
-                                exchanger.exchange(message, getEndpoint().getRequestTimeout(), TimeUnit.MILLISECONDS);
-                            } else {
-                                // we could not correlate the received reply message to a matching request and therefore
-                                // we cannot continue routing the unknown message
-                                // log a warn and then ignore the message
-                                LOG.warn(
-                                        "Reply received for unknown correlationID [{}] on reply destination [{}]. Current correlation map size: {}. The message will be ignored: {}",
-                                        correlationID, replyToDestination, EXCHANGERS.size(), message);
-                            }
-                        } catch (Exception e) {
-                            LOG.warn("Unable to match correlated exchange message: {}. This exception is ignored.", message, e);
-                        }
-                    }
-                });
-                answer = new MessageConsumerResources(session, messageConsumer, replyToDestination);
-            } catch (Exception e) {
-                LOG.error("Unable to create the MessageConsumerResource: {}", e.getMessage());
-                throw new CamelException(e);
-            } finally {
-                connectionResource.returnConnection(conn);
-            }
-            return answer;
-        }
-
-        @Override
-        public boolean validateObject(MessageConsumerResources obj) {
-            try {
-                obj.getSession().getAcknowledgeMode();
-                return true;
-            } catch (JMSException ex) {
-                LOG.debug("Cannot validate session. This exception is ignored.", ex);
-            }
-            return false;
-        }
-
-        @Override
-        public void destroyObject(MessageConsumerResources model) throws Exception {
-            if (model.getMessageConsumer() != null) {
-                model.getMessageConsumer().close();
-            }
-
-            if (model.getSession() != null) {
-                if (model.getSession().getTransacted()) {
-                    try {
-                        model.getSession().rollback();
-                    } catch (Exception e) {
-                        // Do nothing. Just make sure we are cleaned up
-                    }
-                }
-                model.getSession().close();
-            }
-        }
-    }
-
-    @Override
-    protected void doStart() throws Exception {
-        if (isEndpointTransacted()) {
-            throw new IllegalArgumentException(
-                    "InOut exchange pattern is incompatible with transacted=true as it cause a deadlock. Please use transacted=false or InOnly exchange pattern.");
-        }
-
-        if (ObjectHelper.isEmpty(getReplyTo())) {
-            LOG.debug("No reply to destination is defined. Using temporary destinations.");
-        } else {
-            LOG.debug("Using {} as the reply to destination.", getReplyTo());
-        }
-        if (uuidGenerator == null) {
-            // use the generator configured on the camel context
-            uuidGenerator = getEndpoint().getCamelContext().getUuidGenerator();
-        }
-        if (consumers == null) {
-            consumers = new GenericObjectPool<>(new MessageConsumerResourcesFactory());
-            consumers.setMaxActive(getConsumerCount());
-            consumers.setMaxIdle(getConsumerCount());
-            consumers.setTestOnBorrow(getEndpoint().getComponent().isConnectionTestOnBorrow());
-            while (consumers.getNumIdle() < consumers.getMaxIdle()) {
-                consumers.addObject();
-            }
-        }
-        super.doStart();
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        super.doStop();
-        if (consumers != null) {
-            try {
-                consumers.close();
-            } catch (Exception e) {
-                // ignore
-            }
-            consumers = null;
-        }
-    }
-
-    @Override
-    protected void sendMessage(Exchange exchange, Session session, String destinationName) {
-        try {
-            template.execute(session, sc -> {
-                MessageProducer producer = null;
-                try {
-                    Message request = getEndpoint().getBinding().makeJmsMessage(exchange, sc);
-
-                    String correlationId = exchange.getIn().getHeader(JmsConstants.JMS_CORRELATION_ID, String.class);
-                    if (correlationId == null) {
-                        // we append the 'Camel-' prefix to know it was generated by us
-                        correlationId = GENERATED_CORRELATION_ID_PREFIX + getUuidGenerator().generateUuid();
-                    }
-
-                    // the request timeout can be overruled by a header otherwise the endpoint configured value is used
-                    final long timeout
-                            = exchange.getIn().getHeader(SjmsConstants.JMS_REQUEST_TIMEOUT, getEndpoint().getRequestTimeout(),
-                                    long.class);
-
-                    Object responseObject = null;
-                    Exchanger<Object> messageExchanger = new Exchanger<>();
-                    JmsMessageHelper.setCorrelationId(request, correlationId);
-                    EXCHANGERS.put(correlationId, messageExchanger);
-
-                    MessageConsumerResources consumer = consumers.borrowObject();
-                    JmsMessageHelper.setJMSReplyTo(request, consumer.getReplyToDestination());
-                    consumers.returnObject(consumer);
-
-                    producer = getEndpoint().getJmsObjectFactory().createMessageProducer(sc, getEndpoint(), destinationName);
-                    template.send(producer, request);
-
-                    try {
-                        responseObject = messageExchanger.exchange(null, timeout, TimeUnit.MILLISECONDS);
-                        EXCHANGERS.remove(correlationId);
-                    } catch (Throwable e) {
-                        exchange.setException(e);
-                    }
-
-                    if (exchange.getException() == null) {
-                        if (responseObject instanceof Throwable) {
-                            exchange.setException((Throwable) responseObject);
-                        } else if (responseObject instanceof Message) {
-                            Message message = (Message) responseObject;
-
-                            SjmsMessage response
-                                    = new SjmsMessage(exchange, message, consumer.getSession(), getEndpoint().getBinding());
-                            // the JmsBinding is designed to be "pull-based": it will populate the Camel message on demand
-                            // therefore, we link Exchange and OUT message before continuing, so that the JmsBinding has full access
-                            // to everything it may need, and can populate headers, properties, etc. accordingly (solves CAMEL-6218).
-                            exchange.setOut(response);
-                        } else {
-                            exchange.setException(new CamelException("Unknown response type: " + responseObject));
-                        }
-                    }
-
-                } finally {
-                    closeProducer(producer);
-                }
-                return null;
-            });
-        } catch (Exception e) {
-            exchange.setException(new CamelExchangeException("Unable to complete sending the JMS message", exchange, e));
-        }
-    }
-
-}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/CorrelationTimeoutMap.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/CorrelationTimeoutMap.java
new file mode 100644
index 0000000..584c2c3
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/CorrelationTimeoutMap.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms.reply;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.BiConsumer;
+
+import org.apache.camel.support.DefaultTimeoutMap;
+
+import static org.apache.camel.TimeoutMap.Listener.Type.*;
+
+/**
+ * A {@link org.apache.camel.TimeoutMap} which is used to track reply messages which has been timed out, and thus should
+ * trigger the waiting {@link org.apache.camel.Exchange} to timeout as well. Zero (or negative) timeout means infinite
+ * but is actually encoded as {@link Integer#MAX_VALUE} which is 24 days.
+ */
+class CorrelationTimeoutMap extends DefaultTimeoutMap<String, ReplyHandler> {
+
+    private final BiConsumer<ReplyHandler, String> evictionTask;
+
+    CorrelationTimeoutMap(ScheduledExecutorService executor, long requestMapPollTimeMillis, ExecutorService executorService) {
+        super(executor, requestMapPollTimeMillis);
+        // Support synchronous or asynchronous handling of evictions
+        evictionTask = executorService == null
+                ? ReplyHandler::onTimeout
+                : (handler, key) -> executorService.submit(() -> handler.onTimeout(key));
+        addListener(this::listener);
+    }
+
+    private static long encode(long timeoutMillis) {
+        return timeoutMillis > 0 ? timeoutMillis : Integer.MAX_VALUE; // TODO why not Long.MAX_VALUE!
+    }
+
+    private void listener(Listener.Type type, String key, ReplyHandler handler) {
+        if (type == Put) {
+            log.trace("Added correlationID: {}", key);
+        } else if (type == Remove) {
+            log.trace("Removed correlationID: {}", key);
+        } else if (type == Evict) {
+            evictionTask.accept(handler, key);
+            log.trace("Evicted correlationID: {}", key);
+        }
+    }
+
+    @Override
+    public ReplyHandler put(String key, ReplyHandler value, long timeoutMillis) {
+        return super.put(key, value, encode(timeoutMillis));
+    }
+
+    @Override
+    public ReplyHandler putIfAbsent(String key, ReplyHandler value, long timeoutMillis) {
+        return super.putIfAbsent(key, value, encode(timeoutMillis));
+    }
+
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ExclusiveQueueMessageListenerContainer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ExclusiveQueueMessageListenerContainer.java
new file mode 100644
index 0000000..1c416fc
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ExclusiveQueueMessageListenerContainer.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms.reply;
+
+import javax.jms.Destination;
+import javax.jms.MessageConsumer;
+import javax.jms.Session;
+
+import org.apache.camel.component.sjms.MessageListenerContainer;
+import org.apache.camel.component.sjms.SjmsEndpoint;
+import org.apache.camel.component.sjms.consumer.SimpleMessageListenerContainer;
+
+/**
+ * This {@link MessageListenerContainer} is used for reply queues which are exclusive.
+ * <p/>
+ * Mind that exclusive reply queues is per producer, so if you run in a clustered environment then each producer should
+ * use an unique reply queue destination name. If not then other nodes may steal reply messages which was intended for
+ * another. For clustered environments it may be safer to use shared queues as each node will only consume reply
+ * messages which are intended for itself.
+ */
+public class ExclusiveQueueMessageListenerContainer extends SimpleMessageListenerContainer {
+
+    // no need to override any methods currently
+
+    public ExclusiveQueueMessageListenerContainer(SjmsEndpoint endpoint) {
+        super(endpoint);
+    }
+
+    @Override
+    protected MessageConsumer createMessageConsumer(Session session) throws Exception {
+        Destination destination = getDestinationCreationStrategy().createDestination(session, getDestinationName(), false);
+        return getEndpoint().getJmsObjectFactory().createQueueMessageConsumer(session, destination);
+    }
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/MessageSelectorCreator.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/MessageSelectorCreator.java
new file mode 100644
index 0000000..669476a
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/MessageSelectorCreator.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms.reply;
+
+import java.util.concurrent.ConcurrentSkipListSet;
+
+import org.apache.camel.TimeoutMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.TimeoutMap.Listener.Type.*;
+
+/**
+ * A creator which can build the JMS message selector query string to use with a shared reply-to queue, so we can select
+ * the correct messages we expect as replies.
+ */
+public class MessageSelectorCreator {
+    protected static final Logger LOG = LoggerFactory.getLogger(MessageSelectorCreator.class);
+    protected final TimeoutMap<String, ?> timeoutMap;
+    protected final ConcurrentSkipListSet<String> correlationIds;
+    protected volatile boolean dirty = true;
+    protected StringBuilder expression;
+
+    public MessageSelectorCreator(CorrelationTimeoutMap timeoutMap) {
+        this.timeoutMap = timeoutMap;
+        this.timeoutMap.addListener((type, cid, value) -> timeoutEvent(type, cid));
+        // create local set of correlation ids, as its easier to keep track
+        // using the listener so we can flag the dirty flag upon changes
+        // must support concurrent access
+        this.correlationIds = new ConcurrentSkipListSet<>();
+    }
+
+    public synchronized String get() {
+        if (!dirty) {
+            return expression.toString();
+        }
+
+        expression = new StringBuilder("JMSCorrelationID='");
+
+        if (correlationIds.size() == 0) {
+            // no id's so use a dummy to select nothing
+            expression.append("CamelDummyJmsMessageSelector'");
+        } else {
+            boolean first = true;
+            for (String value : correlationIds) {
+                if (!first) {
+                    expression.append(" OR JMSCorrelationID='");
+                }
+                expression.append(value).append("'");
+                if (first) {
+                    first = false;
+                }
+            }
+        }
+
+        String answer = expression.toString();
+
+        dirty = false;
+        return answer;
+    }
+
+    // Changes to live correlation-ids invalidate existing message selector
+    private void timeoutEvent(TimeoutMap.Listener.Type type, String cid) {
+        if (type == Put) {
+            correlationIds.add(cid);
+        } else if (type == Remove || type == Evict) {
+            correlationIds.remove(cid);
+        }
+        dirty = true;
+    }
+
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/DefaultTransactionCommitStrategy.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/QueueReplyHandler.java
similarity index 61%
copy from components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/DefaultTransactionCommitStrategy.java
copy to components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/QueueReplyHandler.java
index a6fbfac..b0c5eee 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/DefaultTransactionCommitStrategy.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/QueueReplyHandler.java
@@ -14,23 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.sjms.tx;
+package org.apache.camel.component.sjms.reply;
 
+import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
-import org.apache.camel.component.sjms.TransactionCommitStrategy;
 
 /**
- * The default commit strategy for all transaction.
+ * {@link ReplyHandler} to handle processing replies when using regular queues.
  */
-public class DefaultTransactionCommitStrategy implements TransactionCommitStrategy {
+public class QueueReplyHandler extends TemporaryQueueReplyHandler {
 
-    @Override
-    public boolean commit(Exchange exchange) throws Exception {
-        return true;
+    public QueueReplyHandler(ReplyManager replyManager, Exchange exchange, AsyncCallback callback,
+                             String originalCorrelationId, String correlationId, long timeout) {
+        super(replyManager, exchange, callback, originalCorrelationId, correlationId, timeout);
     }
 
-    @Override
-    public boolean rollback(Exchange exchange) throws Exception {
-        return true;
-    }
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/QueueReplyManager.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/QueueReplyManager.java
new file mode 100644
index 0000000..30ee6ee
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/QueueReplyManager.java
@@ -0,0 +1,142 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms.reply;
+
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.sjms.MessageListenerContainer;
+import org.apache.camel.component.sjms.ReplyToType;
+import org.apache.camel.component.sjms.consumer.SimpleMessageListenerContainer;
+import org.apache.camel.component.sjms.jms.DestinationCreationStrategy;
+
+/**
+ * A {@link ReplyManager} when using regular queues.
+ */
+public class QueueReplyManager extends ReplyManagerSupport {
+
+    public QueueReplyManager(CamelContext camelContext) {
+        super(camelContext);
+    }
+
+    @Override
+    protected ReplyHandler createReplyHandler(
+            ReplyManager replyManager, Exchange exchange, AsyncCallback callback,
+            String originalCorrelationId, String correlationId, long requestTimeout) {
+        return new QueueReplyHandler(
+                replyManager, exchange, callback,
+                originalCorrelationId, correlationId, requestTimeout);
+    }
+
+    @Override
+    public void setReplyToSelectorHeader(org.apache.camel.Message camelMessage, Message jmsMessage) throws JMSException {
+        // noop
+    }
+
+    @Override
+    public void updateCorrelationId(String correlationId, String newCorrelationId, long requestTimeout) {
+        log.trace("Updated provisional correlationId [{}] to expected correlationId [{}]", correlationId, newCorrelationId);
+
+        ReplyHandler handler = correlation.remove(correlationId);
+        if (handler == null) {
+            // should not happen that we can't find the handler
+            return;
+        }
+
+        correlation.put(newCorrelationId, handler, requestTimeout);
+    }
+
+    @Override
+    protected void handleReplyMessage(String correlationID, Message message, Session session) {
+        ReplyHandler handler = correlation.get(correlationID);
+
+        if (handler != null) {
+            correlation.remove(correlationID);
+            handler.onReply(correlationID, message, session);
+        } else {
+            // we could not correlate the received reply message to a matching request and therefore
+            // we cannot continue routing the unknown message
+            // log a warn and then ignore the message
+            log.warn(
+                    "Reply received for unknown correlationID [{}] on reply destination [{}]. Current correlation map size: {}. The message will be ignored: {}",
+                    correlationID, replyTo, correlation.size(), message);
+        }
+    }
+
+    private final class DestinationResolverDelegate implements DestinationCreationStrategy {
+        private final DestinationCreationStrategy delegate;
+        private Destination destination;
+
+        DestinationResolverDelegate(DestinationCreationStrategy delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public Destination createDestination(Session session, String destinationName, boolean topic) throws JMSException {
+            synchronized (QueueReplyManager.this) {
+                // resolve the reply to destination
+                if (destination == null) {
+                    destination = delegate.createDestination(session, destinationName, topic);
+                    setReplyTo(destination);
+                }
+            }
+            return destination;
+        }
+
+        @Override
+        public Destination createTemporaryDestination(Session session, boolean topic) throws JMSException {
+            return null;
+        }
+    }
+
+    @Override
+    protected MessageListenerContainer createListenerContainer() throws Exception {
+        SimpleMessageListenerContainer answer;
+
+        ReplyToType type = endpoint.getReplyToType();
+        if (type == null) {
+            // use exclusive by default for reply queues
+            type = ReplyToType.Exclusive;
+        }
+
+        if (ReplyToType.Exclusive == type) {
+            answer = new ExclusiveQueueMessageListenerContainer(endpoint);
+            log.debug("Using exclusive queue: {} as reply listener: {}", endpoint.getReplyTo(), answer);
+        } else {
+            throw new IllegalArgumentException("ReplyToType " + type + " is not supported for reply queues");
+        }
+        answer.setMessageListener(this);
+
+        answer.setConcurrentConsumers(endpoint.getReplyToConcurrentConsumers());
+        answer.setDestinationCreationStrategy(new DestinationResolverDelegate(endpoint.getDestinationCreationStrategy()));
+        answer.setDestinationName(endpoint.getReplyTo());
+
+        String clientId = endpoint.getComponent().getClientId();
+        if (clientId != null) {
+            clientId += ".CamelReplyManager";
+            answer.setClientId(clientId);
+        }
+
+        return answer;
+    }
+
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/DefaultTransactionCommitStrategy.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyHandler.java
similarity index 57%
rename from components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/DefaultTransactionCommitStrategy.java
rename to components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyHandler.java
index a6fbfac..73dc833 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/DefaultTransactionCommitStrategy.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyHandler.java
@@ -14,23 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.sjms.tx;
+package org.apache.camel.component.sjms.reply;
 
-import org.apache.camel.Exchange;
-import org.apache.camel.component.sjms.TransactionCommitStrategy;
+import javax.jms.Message;
+import javax.jms.Session;
 
 /**
- * The default commit strategy for all transaction.
+ * Handles a reply.
  */
-public class DefaultTransactionCommitStrategy implements TransactionCommitStrategy {
+public interface ReplyHandler {
 
-    @Override
-    public boolean commit(Exchange exchange) throws Exception {
-        return true;
-    }
+    /**
+     * The reply message was received
+     *
+     * @param correlationId the correlation id
+     * @param reply         the JMS reply message
+     * @param session       the JMS session
+     */
+    void onReply(String correlationId, Message reply, Session session);
 
-    @Override
-    public boolean rollback(Exchange exchange) throws Exception {
-        return true;
-    }
+    /**
+     * The reply message was not received and a timeout triggered
+     *
+     * @param correlationId the correlation id
+     */
+    void onTimeout(String correlationId);
 }
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyHolder.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyHolder.java
new file mode 100644
index 0000000..4f3b3c7
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyHolder.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms.reply;
+
+import javax.jms.Message;
+import javax.jms.Session;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.Exchange;
+
+/**
+ * Holder which contains the {@link Exchange} and {@link AsyncCallback} to be used when the reply arrives, so we can set
+ * the reply on the {@link Exchange} and continue routing using the callback.
+ */
+public class ReplyHolder {
+
+    private final Exchange exchange;
+    private final AsyncCallback callback;
+    private final Message message;
+    private final Session session;
+    private final String originalCorrelationId;
+    private final String correlationId;
+    private long timeout;
+
+    /**
+     * Constructor to use when a reply message was received
+     */
+    public ReplyHolder(Exchange exchange, AsyncCallback callback, String originalCorrelationId,
+                       String correlationId, Message message, Session session) {
+        this.exchange = exchange;
+        this.callback = callback;
+        this.originalCorrelationId = originalCorrelationId;
+        this.correlationId = correlationId;
+        this.message = message;
+        this.session = session;
+    }
+
+    /**
+     * Constructor to use when a timeout occurred
+     */
+    public ReplyHolder(Exchange exchange, AsyncCallback callback, String originalCorrelationId,
+                       String correlationId, long timeout) {
+        this(exchange, callback, originalCorrelationId, correlationId, null, null);
+        this.timeout = timeout;
+    }
+
+    public Exchange getExchange() {
+        return exchange;
+    }
+
+    public AsyncCallback getCallback() {
+        return callback;
+    }
+
+    /**
+     * Gets the original correlation id, if one was set when sending the message.
+     * <p/>
+     * Some JMS brokers will mess with the correlation id and send back a different/empty correlation id. So we need to
+     * remember it so we can restore the correlation id.
+     */
+    public String getOriginalCorrelationId() {
+        return originalCorrelationId;
+    }
+
+    /**
+     * Gets the correlation id
+     *
+     * @see #getOriginalCorrelationId()
+     */
+    public String getCorrelationId() {
+        return correlationId;
+    }
+
+    /**
+     * Gets the received message
+     *
+     * @return the received message, or <tt>null</tt> if timeout occurred and no message has been received
+     * @see    #isTimeout()
+     */
+    public Message getMessage() {
+        return message;
+    }
+
+    /**
+     * Gets the JMS session from the received message
+     *
+     * @return the JMS session, or <tt>null</tt> if timeout occurred and no message has been received
+     * @see    #isTimeout()
+     */
+    public Session getSession() {
+        return session;
+    }
+
+    /**
+     * Whether timeout triggered or not.
+     * <p/>
+     * A timeout is triggered if <tt>requestTimeout</tt> option has been configured, and a reply message has <b>not</b>
+     * been received within that time frame.
+     */
+    public boolean isTimeout() {
+        return message == null;
+    }
+
+    /**
+     * The timeout value
+     */
+    public long getRequestTimeout() {
+        return timeout;
+    }
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManager.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManager.java
new file mode 100644
index 0000000..60fdc8e
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManager.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms.reply;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.sjms.SessionMessageListener;
+import org.apache.camel.component.sjms.SjmsEndpoint;
+
+/**
+ * The {@link ReplyManager} is responsible for handling
+ * <a href="http://camel.apache.org/request-reply.html">request-reply</a> over JMS.
+ */
+public interface ReplyManager extends SessionMessageListener {
+
+    /**
+     * Sets the belonging {@link org.apache.camel.component.sjms.SjmsEndpoint}.
+     */
+    void setEndpoint(SjmsEndpoint endpoint);
+
+    /**
+     * Sets the reply to queue the manager should listen for replies.
+     * <p/>
+     * The queue is either a temporary or a persistent queue.
+     */
+    void setReplyTo(Destination replyTo);
+
+    /**
+     * Sets the scheduled thread pool to use when checking for timeouts (no reply received within a given time period)
+     */
+    void setScheduledExecutorService(ScheduledExecutorService executorService);
+
+    /**
+     * Sets the thread pool to use for continue routing {@link Exchange} when a timeout was triggered when doing
+     * request/reply over JMS.
+     */
+    void setOnTimeoutExecutorService(ExecutorService executorService);
+
+    /**
+     * Sets the JMS message property used for message correlation. If set message correlation will be performed on the
+     * value of this JMS property, JMSCorrelationID will be ignored.
+     */
+    @Deprecated
+    void setCorrelationProperty(String correlationProperty);
+
+    /**
+     * Gets the reply to queue being used
+     */
+    Destination getReplyTo();
+
+    /**
+     * To be used when a reply queue is used with a custom JMS selector is being used.
+     */
+    @Deprecated
+    void setReplyToSelectorHeader(org.apache.camel.Message camelMessage, Message jmsMessage) throws JMSException;
+
+    /**
+     * Register a reply
+     *
+     * @param  replyManager          the reply manager being used
+     * @param  exchange              the exchange
+     * @param  callback              the callback
+     * @param  originalCorrelationId an optional original correlation id
+     * @param  correlationId         the correlation id to expect being used
+     * @param  requestTimeout        the timeout
+     * @return                       the correlation id used
+     */
+    String registerReply(
+            ReplyManager replyManager, Exchange exchange, AsyncCallback callback,
+            String originalCorrelationId, String correlationId, long requestTimeout);
+
+    /**
+     * Updates the correlation id to the new correlation id.
+     * <p/>
+     * This is only used when <tt>useMessageIDasCorrelationID</tt> option is used, which means a provisional correlation
+     * id is first used, then after the message has been sent, the real correlation id is known. This allows us then to
+     * update the internal mapping to expect the real correlation id.
+     *
+     * @param correlationId    the provisional correlation id
+     * @param newCorrelationId the real correlation id
+     * @param requestTimeout   the timeout
+     */
+    void updateCorrelationId(String correlationId, String newCorrelationId, long requestTimeout);
+
+    /**
+     * Process the reply
+     *
+     * @param holder containing needed data to process the reply and continue routing
+     */
+    void processReply(ReplyHolder holder);
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManagerSupport.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManagerSupport.java
new file mode 100644
index 0000000..22a195f
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManagerSupport.java
@@ -0,0 +1,264 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms.reply;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangeTimedOutException;
+import org.apache.camel.component.sjms.MessageListenerContainer;
+import org.apache.camel.component.sjms.SjmsEndpoint;
+import org.apache.camel.component.sjms.SjmsMessage;
+import org.apache.camel.component.sjms.jms.JmsMessageHelper;
+import org.apache.camel.support.ExchangeHelper;
+import org.apache.camel.support.service.ServiceHelper;
+import org.apache.camel.support.service.ServiceSupport;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Base class for {@link ReplyManager} implementations.
+ */
+public abstract class ReplyManagerSupport extends ServiceSupport implements ReplyManager {
+
+    protected final Logger log = LoggerFactory.getLogger(getClass());
+    protected final CamelContext camelContext;
+    protected ScheduledExecutorService scheduledExecutorService;
+    protected ExecutorService executorService;
+    protected SjmsEndpoint endpoint;
+    protected Destination replyTo;
+    protected MessageListenerContainer listenerContainer;
+    protected final CountDownLatch replyToLatch = new CountDownLatch(1);
+    protected final long replyToTimeout = 10000;
+    protected CorrelationTimeoutMap correlation;
+    protected String correlationProperty;
+
+    public ReplyManagerSupport(CamelContext camelContext) {
+        this.camelContext = camelContext;
+    }
+
+    @Override
+    public void setScheduledExecutorService(ScheduledExecutorService executorService) {
+        this.scheduledExecutorService = executorService;
+    }
+
+    @Override
+    public void setOnTimeoutExecutorService(ExecutorService executorService) {
+        this.executorService = executorService;
+    }
+
+    @Override
+    public void setEndpoint(SjmsEndpoint endpoint) {
+        this.endpoint = endpoint;
+    }
+
+    @Override
+    public void setReplyTo(Destination replyTo) {
+        log.trace("ReplyTo destination: {}", replyTo);
+        this.replyTo = replyTo;
+        // trigger latch as the reply to has been resolved and set
+        replyToLatch.countDown();
+    }
+
+    @Override
+    public void setCorrelationProperty(final String correlationProperty) {
+        this.correlationProperty = correlationProperty;
+    }
+
+    @Override
+    public Destination getReplyTo() {
+        if (replyTo != null) {
+            return replyTo;
+        }
+        try {
+            // the reply to destination has to be resolved using a DestinationResolver using
+            // the MessageListenerContainer which occurs asynchronously so we have to wait
+            // for that to happen before we can retrieve the reply to destination to be used
+            log.trace("Waiting for replyTo to be set");
+            boolean done = replyToLatch.await(replyToTimeout, TimeUnit.MILLISECONDS);
+            if (!done) {
+                log.warn("ReplyTo destination was not set and timeout occurred");
+            } else {
+                log.trace("Waiting for replyTo to be set done");
+            }
+        } catch (InterruptedException e) {
+            // ignore
+        }
+        return replyTo;
+    }
+
+    @Override
+    public String registerReply(
+            ReplyManager replyManager, Exchange exchange, AsyncCallback callback,
+            String originalCorrelationId, String correlationId, long requestTimeout) {
+        // add to correlation map
+        QueueReplyHandler handler = new QueueReplyHandler(
+                replyManager, exchange, callback,
+                originalCorrelationId, correlationId, requestTimeout);
+        // Just make sure we don't override the old value of the correlationId
+        ReplyHandler result = correlation.putIfAbsent(correlationId, handler, requestTimeout);
+        if (result != null) {
+            String logMessage = String.format("The correlationId [%s] is not unique.", correlationId);
+            throw new IllegalArgumentException(logMessage);
+        }
+        return correlationId;
+    }
+
+    protected abstract ReplyHandler createReplyHandler(
+            ReplyManager replyManager, Exchange exchange, AsyncCallback callback,
+            String originalCorrelationId, String correlationId, long requestTimeout);
+
+    @Override
+    public void onMessage(Message message, Session session) throws JMSException {
+        String correlationID = null;
+
+        try {
+            if (correlationProperty == null) {
+                correlationID = message.getJMSCorrelationID();
+            } else {
+                correlationID = message.getStringProperty(correlationProperty);
+            }
+        } catch (JMSException e) {
+            // ignore
+        }
+
+        if (correlationID == null) {
+            log.warn("Ignoring message with no correlationID: {}", message);
+            return;
+        }
+
+        log.debug("Received reply message with correlationID [{}] -> {}", correlationID, message);
+
+        // handle the reply message
+        handleReplyMessage(correlationID, message, session);
+    }
+
+    @Override
+    public void processReply(ReplyHolder holder) {
+        if (holder != null && isRunAllowed()) {
+            try {
+                Exchange exchange = holder.getExchange();
+
+                boolean timeout = holder.isTimeout();
+                if (timeout) {
+                    // timeout occurred do a WARN log so its easier to spot in the logs
+                    if (log.isWarnEnabled()) {
+                        log.warn(
+                                "Timeout occurred after {} millis waiting for reply message with correlationID [{}] on destination {}."
+                                 + " Setting ExchangeTimedOutException on {} and continue routing.",
+                                holder.getRequestTimeout(), holder.getCorrelationId(), replyTo,
+                                ExchangeHelper.logIds(exchange));
+                    }
+
+                    // no response, so lets set a timed out exception
+                    String msg = "reply message with correlationID: " + holder.getCorrelationId()
+                                 + " not received on destination: " + replyTo;
+                    exchange.setException(new ExchangeTimedOutException(exchange, holder.getRequestTimeout(), msg));
+                } else {
+                    Message message = holder.getMessage();
+                    Session session = holder.getSession();
+                    SjmsMessage response = new SjmsMessage(exchange, message, session, endpoint.getBinding());
+                    // the JmsBinding is designed to be "pull-based": it will populate the Camel message on demand
+                    // therefore, we link Exchange and OUT message before continuing, so that the JmsBinding has full access 
+                    // to everything it may need, and can populate headers, properties, etc. accordingly (solves CAMEL-6218).
+                    exchange.setOut(response);
+                    Object body = response.getBody();
+
+                    if (endpoint.isTransferException() && body instanceof Exception) {
+                        log.debug("Reply was an Exception. Setting the Exception on the Exchange: {}", body);
+                        // we got an exception back and endpoint was configured to transfer exception
+                        // therefore set response as exception
+                        exchange.setException((Exception) body);
+                    } else {
+                        log.debug("Reply received. OUT message body set to reply payload: {}", body);
+                    }
+
+                    // restore correlation id in case the remote server messed with it
+                    if (holder.getOriginalCorrelationId() != null) {
+                        JmsMessageHelper.setCorrelationId(message, holder.getOriginalCorrelationId());
+                        exchange.getOut().setHeader("JMSCorrelationID", holder.getOriginalCorrelationId());
+                    }
+                }
+            } finally {
+                // notify callback
+                AsyncCallback callback = holder.getCallback();
+                callback.done(false);
+            }
+        }
+    }
+
+    protected abstract void handleReplyMessage(String correlationID, Message message, Session session);
+
+    protected abstract MessageListenerContainer createListenerContainer() throws Exception;
+
+    @Override
+    protected void doStart() throws Exception {
+        ObjectHelper.notNull(executorService, "executorService", this);
+        ObjectHelper.notNull(scheduledExecutorService, "scheduledExecutorService", this);
+        ObjectHelper.notNull(endpoint, "endpoint", this);
+
+        // timeout map to use for purging messages which have timed out, while waiting for an expected reply
+        // when doing request/reply over JMS
+        log.trace("Using timeout checker interval with {} millis", endpoint.getComponent().getRequestTimeoutCheckerInterval());
+        correlation = new CorrelationTimeoutMap(
+                scheduledExecutorService, endpoint.getComponent().getRequestTimeoutCheckerInterval(), executorService);
+        ServiceHelper.startService(correlation);
+
+        // create JMS listener and start it
+        listenerContainer = createListenerContainer();
+        listenerContainer.afterPropertiesConfigured(endpoint.getCamelContext());
+        log.debug("Starting reply listener container on endpoint: {}", endpoint);
+
+        ServiceHelper.startService(listenerContainer);
+    }
+
+    @Override
+    protected void doStop() throws Exception {
+        ServiceHelper.stopService(correlation);
+
+        if (listenerContainer != null) {
+            log.debug("Stopping reply listener container on endpoint: {}", endpoint);
+            try {
+                ServiceHelper.stopAndShutdownService(listenerContainer);
+            } finally {
+                listenerContainer = null;
+            }
+        }
+
+        // must also stop executor service
+        if (scheduledExecutorService != null) {
+            camelContext.getExecutorServiceManager().shutdownGraceful(scheduledExecutorService);
+            scheduledExecutorService = null;
+        }
+        if (executorService != null) {
+            camelContext.getExecutorServiceManager().shutdownGraceful(executorService);
+            executorService = null;
+        }
+    }
+
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueMessageListenerContainer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueMessageListenerContainer.java
new file mode 100644
index 0000000..3e1c933
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueMessageListenerContainer.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms.reply;
+
+import javax.jms.Destination;
+import javax.jms.MessageConsumer;
+import javax.jms.Session;
+
+import org.apache.camel.component.sjms.MessageListenerContainer;
+import org.apache.camel.component.sjms.SjmsEndpoint;
+import org.apache.camel.component.sjms.consumer.SimpleMessageListenerContainer;
+
+/**
+ * This {@link MessageListenerContainer} is used for reply queues which are using temporary queue.
+ */
+public class TemporaryQueueMessageListenerContainer extends SimpleMessageListenerContainer {
+
+    // no need to override any methods currently
+
+    public TemporaryQueueMessageListenerContainer(SjmsEndpoint endpoint) {
+        super(endpoint);
+    }
+
+    @Override
+    protected MessageConsumer createMessageConsumer(Session session) throws Exception {
+        Destination destination = getDestinationCreationStrategy().createTemporaryDestination(session, false);
+        return getEndpoint().getJmsObjectFactory().createQueueMessageConsumer(session, destination);
+    }
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyHandler.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyHandler.java
new file mode 100644
index 0000000..1fe0c70
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyHandler.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms.reply;
+
+import javax.jms.Message;
+import javax.jms.Session;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.Exchange;
+
+/**
+ * {@link ReplyHandler} to handle processing replies when using temporary queues.
+ */
+public class TemporaryQueueReplyHandler implements ReplyHandler {
+
+    // task queue to add the holder so we can process the reply
+    protected final ReplyManager replyManager;
+    protected final Exchange exchange;
+    protected final AsyncCallback callback;
+    // remember the original correlation id, in case the server returns back a reply with a messed up correlation id
+    protected final String originalCorrelationId;
+    protected final String correlationId;
+    protected final long timeout;
+
+    public TemporaryQueueReplyHandler(ReplyManager replyManager, Exchange exchange, AsyncCallback callback,
+                                      String originalCorrelationId, String correlationId, long timeout) {
+        this.replyManager = replyManager;
+        this.exchange = exchange;
+        this.originalCorrelationId = originalCorrelationId;
+        this.correlationId = correlationId;
+        this.callback = callback;
+        this.timeout = timeout;
+    }
+
+    @Override
+    public void onReply(String correlationId, Message reply, Session session) {
+        // create holder object with the reply
+        ReplyHolder holder = new ReplyHolder(exchange, callback, originalCorrelationId, correlationId, reply, session);
+        // process the reply
+        replyManager.processReply(holder);
+    }
+
+    @Override
+    public void onTimeout(String correlationId) {
+        // create holder object without the reply which means a timeout occurred
+        ReplyHolder holder = new ReplyHolder(exchange, callback, originalCorrelationId, correlationId, timeout);
+        // process timeout
+        replyManager.processReply(holder);
+    }
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyManager.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyManager.java
new file mode 100644
index 0000000..6210d53
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyManager.java
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms.reply;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.jms.Destination;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
+import javax.jms.TemporaryQueue;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.sjms.MessageListenerContainer;
+import org.apache.camel.component.sjms.jms.DestinationCreationStrategy;
+
+/**
+ * A {@link ReplyManager} when using temporary queues.
+ */
+public class TemporaryQueueReplyManager extends ReplyManagerSupport {
+
+    final TemporaryReplyQueueDestinationResolver destResolver = new TemporaryReplyQueueDestinationResolver();
+
+    public TemporaryQueueReplyManager(CamelContext camelContext) {
+        super(camelContext);
+    }
+
+    @Override
+    public Destination getReplyTo() {
+        try {
+            destResolver.destinationReady();
+        } catch (InterruptedException e) {
+            log.warn("Interrupted while waiting for JMSReplyTo destination refresh", e);
+        }
+        return super.getReplyTo();
+    }
+
+    @Override
+    protected ReplyHandler createReplyHandler(
+            ReplyManager replyManager, Exchange exchange, AsyncCallback callback,
+            String originalCorrelationId, String correlationId, long requestTimeout) {
+        return new TemporaryQueueReplyHandler(this, exchange, callback, originalCorrelationId, correlationId, requestTimeout);
+    }
+
+    @Override
+    public void updateCorrelationId(String correlationId, String newCorrelationId, long requestTimeout) {
+        log.trace("Updated provisional correlationId [{}] to expected correlationId [{}]", correlationId, newCorrelationId);
+
+        ReplyHandler handler = correlation.remove(correlationId);
+        if (handler != null) {
+            correlation.put(newCorrelationId, handler, requestTimeout);
+        }
+    }
+
+    @Override
+    protected void handleReplyMessage(String correlationID, Message message, Session session) {
+        ReplyHandler handler = correlation.get(correlationID);
+        if (handler != null) {
+            correlation.remove(correlationID);
+            handler.onReply(correlationID, message, session);
+        } else {
+            // we could not correlate the received reply message to a matching request and therefore
+            // we cannot continue routing the unknown message
+            // log a warn and then ignore the message
+            log.warn("Reply received for unknown correlationID [{}]. The message will be ignored: {}", correlationID, message);
+        }
+    }
+
+    @Override
+    public void setReplyToSelectorHeader(org.apache.camel.Message camelMessage, Message jmsMessage) throws JMSException {
+        // noop
+    }
+
+    @Override
+    protected MessageListenerContainer createListenerContainer() throws Exception {
+        TemporaryQueueMessageListenerContainer answer
+                = new TemporaryQueueMessageListenerContainer(endpoint);
+        answer.setMessageListener(this);
+
+        String clientId = endpoint.getComponent().getClientId();
+        if (clientId != null) {
+            clientId += ".CamelReplyManager";
+            answer.setClientId(clientId);
+        }
+        answer.setConcurrentConsumers(endpoint.getReplyToConcurrentConsumers());
+        answer.setExceptionListener(new TemporaryReplyQueueExceptionListener(destResolver));
+        answer.setDestinationCreationStrategy(destResolver);
+        answer.setDestinationName("temporary");
+        return answer;
+    }
+
+    private final class TemporaryReplyQueueExceptionListener implements ExceptionListener {
+        private final TemporaryReplyQueueDestinationResolver destResolver;
+
+        private TemporaryReplyQueueExceptionListener(TemporaryReplyQueueDestinationResolver destResolver) {
+            this.destResolver = destResolver;
+        }
+
+        @Override
+        public void onException(JMSException exception) {
+            // capture exceptions, and schedule a refresh of the ReplyTo destination
+            log.warn("Exception inside the DMLC for Temporary ReplyTo Queue for destination {}, refreshing ReplyTo destination",
+                    endpoint.getDestinationName(), exception);
+            destResolver.scheduleRefresh();
+        }
+
+    }
+
+    private final class TemporaryReplyQueueDestinationResolver implements DestinationCreationStrategy {
+        private TemporaryQueue queue;
+        private final AtomicBoolean refreshWanted = new AtomicBoolean();
+
+        @Override
+        public Destination createDestination(Session session, String name, boolean topic) throws JMSException {
+            return null;
+        }
+
+        @Override
+        public Destination createTemporaryDestination(Session session, boolean topic) throws JMSException {
+            synchronized (refreshWanted) {
+                if (queue == null || refreshWanted.get()) {
+                    refreshWanted.set(false);
+                    queue = session.createTemporaryQueue();
+                    setReplyTo(queue);
+                    if (log.isDebugEnabled()) {
+                        log.debug("Refreshed Temporary ReplyTo Queue. New queue: {}", queue.getQueueName());
+                    }
+                    refreshWanted.notifyAll();
+                }
+            }
+            return queue;
+        }
+
+        public void scheduleRefresh() {
+            refreshWanted.set(true);
+        }
+
+        public void destinationReady() throws InterruptedException {
+            if (refreshWanted.get()) {
+                synchronized (refreshWanted) {
+                    //check if requestWanted is still true
+                    if (refreshWanted.get()) {
+                        log.debug("Waiting for new Temporary ReplyTo queue to be assigned before we can continue");
+                        refreshWanted.wait();
+                    }
+                }
+            }
+        }
+
+    }
+
+}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/package.html b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/package.html
new file mode 100644
index 0000000..56d2984
--- /dev/null
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/package.html
@@ -0,0 +1,27 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<html>
+<head>
+</head>
+<body>
+
+Logic implementing support for request/reply over JMS
+
+</body>
+</html>
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java
deleted file mode 100644
index ae8e3e4..0000000
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.tx;
-
-import javax.jms.Connection;
-import javax.jms.Session;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.component.sjms.TransactionCommitStrategy;
-import org.apache.camel.support.SynchronizationAdapter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * SessionTransactionSynchronization is called at the completion of each {@link org.apache.camel.Exchange}.
- * <p/>
- * The commit or rollback on the {@link Session} must be performed from the same thread that consumed the message.
- */
-public class SessionTransactionSynchronization extends SynchronizationAdapter {
-    private static final Logger LOG = LoggerFactory.getLogger(SessionTransactionSynchronization.class);
-
-    private final Connection connection;
-    private final Session session;
-    private final TransactionCommitStrategy commitStrategy;
-    private final boolean close;
-
-    public SessionTransactionSynchronization(Connection connection, Session session, TransactionCommitStrategy commitStrategy,
-                                             boolean close) {
-        this.connection = connection;
-        this.session = session;
-        this.close = close;
-        if (commitStrategy == null) {
-            this.commitStrategy = new DefaultTransactionCommitStrategy();
-        } else {
-            this.commitStrategy = commitStrategy;
-        }
-    }
-
-    @Override
-    public void onFailure(Exchange exchange) {
-        try {
-            if (commitStrategy.rollback(exchange)) {
-                LOG.debug("Processing failure of ExchangeId: {}", exchange.getExchangeId());
-                if (session != null && session.getTransacted()) {
-                    session.rollback();
-                }
-            }
-        } catch (Exception e) {
-            LOG.warn("Failed to rollback the JMS session: {}", e.getMessage());
-        }
-
-        if (close) {
-            close(session);
-            close(connection);
-        }
-    }
-
-    @Override
-    public void onComplete(Exchange exchange) {
-        try {
-            if (commitStrategy.commit(exchange)) {
-                LOG.debug("Processing completion of ExchangeId: {}", exchange.getExchangeId());
-                if (session != null && session.getTransacted()) {
-                    session.commit();
-                }
-            }
-        } catch (Exception e) {
-            LOG.warn("Failed to commit the JMS session: {}", e.getMessage());
-            exchange.setException(e);
-        }
-
-        if (close) {
-            close(session);
-            close(connection);
-        }
-    }
-
-    @Override
-    public boolean allowHandover() {
-        // must not handover as we should be synchronous
-        return false;
-    }
-
-    private static void close(Connection con) {
-        if (con != null) {
-            try {
-                con.close();
-            } catch (Throwable e) {
-                // ignore
-            }
-        }
-    }
-
-    private static void close(Session session) {
-        if (session != null) {
-            try {
-                session.close();
-            } catch (Throwable e) {
-                // ignore
-            }
-        }
-    }
-
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java
index f3ccfb4..295b19b 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java
@@ -23,7 +23,6 @@ import javax.jms.MessageListener;
 import javax.jms.MessageProducer;
 import javax.jms.TextMessage;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.sjms.support.JmsTestSupport;
@@ -82,13 +81,6 @@ public class ReconnectInOutProducerTest extends JmsTestSupport {
         };
     }
 
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        CamelContext camelContext = super.createCamelContext();
-        camelContext.getComponent("sjms", SjmsComponent.class).setConnectionTestOnBorrow(true);
-        return camelContext;
-    }
-
     protected class MyMessageListener implements MessageListener {
         private String requestText;
         private String responseText;
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java
index 04b6ce5..6010e68 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java
@@ -20,7 +20,6 @@ import javax.jms.Message;
 import javax.jms.MessageConsumer;
 import javax.jms.TextMessage;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.sjms.support.JmsTestSupport;
@@ -87,7 +86,7 @@ public class ReconnectProducerTest extends JmsTestSupport {
         return new RouteBuilder() {
             public void configure() {
                 from("direct:start")
-                        .to("sjms:queue:" + TEST_DESTINATION_NAME + "?consumerCount=10");
+                        .to("sjms:queue:" + TEST_DESTINATION_NAME + "?concurrentConsumers=10");
 
                 from("direct:finish")
                         .to("log:test.log.1?showBody=true", "mock:result");
@@ -95,10 +94,4 @@ public class ReconnectProducerTest extends JmsTestSupport {
         };
     }
 
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        CamelContext camelContext = super.createCamelContext();
-        camelContext.getComponent("sjms", SjmsComponent.class).setConnectionTestOnBorrow(true);
-        return camelContext;
-    }
 }
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java
deleted file mode 100644
index 460497c..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms;
-
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Session;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.sjms.jms.DefaultDestinationCreationStrategy;
-import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class SjmsDestinationCreationStrategyTest extends JmsTestSupport {
-
-    private boolean createDestinationCalled;
-    private boolean createTemporaryDestination;
-
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        CamelContext camelContext = new DefaultCamelContext();
-        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(brokerUri);
-        setupFactoryExternal(connectionFactory);
-        SjmsComponent component = new SjmsComponent();
-        component.setConnectionFactory(connectionFactory);
-        component.setDestinationCreationStrategy(new TestDestinationCreationStrategyTest());
-        camelContext.addComponent("sjms", component);
-        return camelContext;
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("sjms:queue:inout?exchangePattern=InOut")
-                        .process(exchange -> exchange.getMessage().setBody("response"));
-            }
-        };
-    }
-
-    @Test
-    public void testSjmsComponentUsesCustomDestinationCreationStrategy() throws Exception {
-        assertFalse(createDestinationCalled);
-        template.sendBody("sjms:queue:inonly", "hello world");
-        assertTrue(createDestinationCalled);
-
-        assertFalse(createTemporaryDestination);
-        String response = (String) template.sendBody("sjms:queue:inout?exchangePattern=InOut",
-                ExchangePattern.InOut, "hello world 2");
-        assertTrue(createTemporaryDestination);
-        assertEquals("response", response);
-    }
-
-    class TestDestinationCreationStrategyTest extends DefaultDestinationCreationStrategy {
-        @Override
-        public Destination createDestination(Session session, String name, boolean topic) throws JMSException {
-            if (name.equals("inonly")) {
-                createDestinationCalled = true;
-            }
-            return super.createDestination(session, name, topic);
-        }
-
-        @Override
-        public Destination createTemporaryDestination(Session session, boolean topic) throws JMSException {
-            createTemporaryDestination = true;
-            return super.createTemporaryDestination(session, topic);
-        }
-    }
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java
index a888b50..2f4aa3d 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.sjms;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
-import org.apache.camel.component.sjms.jms.ConnectionFactoryResource;
-import org.apache.camel.component.sjms.jms.ConnectionResource;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.SimpleRegistry;
 import org.apache.camel.test.junit5.CamelTestSupport;
@@ -33,7 +31,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class SjmsEndpointConnectionSettingsTest extends CamelTestSupport {
     private final ActiveMQConnectionFactory connectionFactory
             = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
-    private final ConnectionResource connectionResource = new ConnectionFactoryResource(2, connectionFactory);
 
     @Test
     public void testConnectionFactory() {
@@ -44,20 +41,10 @@ public class SjmsEndpointConnectionSettingsTest extends CamelTestSupport {
         assertEquals(connectionFactory, qe.getConnectionFactory());
     }
 
-    @Test
-    public void testConnectionResource() {
-        Endpoint endpoint = context.getEndpoint("sjms:queue:test?connectionResource=#connresource");
-        assertNotNull(endpoint);
-        assertTrue(endpoint instanceof SjmsEndpoint);
-        SjmsEndpoint qe = (SjmsEndpoint) endpoint;
-        assertEquals(connectionResource, qe.getConnectionResource());
-    }
-
     @Override
     protected CamelContext createCamelContext() throws Exception {
         SimpleRegistry registry = new SimpleRegistry();
         registry.bind("activemq", connectionFactory);
-        registry.bind("connresource", connectionResource);
         return new DefaultCamelContext(registry);
     }
 }
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncTrueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncTrueTest.java
deleted file mode 100644
index 7d9259f..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncTrueTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.consumer;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.jupiter.api.Test;
-
-/**
- *
- */
-public class InOnlyConsumerAsyncTrueTest extends JmsTestSupport {
-
-    private static final String MOCK_RESULT = "mock:result";
-
-    @Test
-    public void testInOnlyConsumerAsyncTrue() throws Exception {
-        getMockEndpoint(MOCK_RESULT).expectedBodiesReceived("Hello World", "Hello Camel");
-
-        template.sendBody("sjms:queue:in.only.consumer.async", "Hello Camel");
-        template.sendBody("sjms:queue:in.only.consumer.async", "Hello World");
-        //        Thread.sleep(4000);
-
-        assertMockEndpointsSatisfied();
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("sjms:queue:in.only.consumer.async?asyncConsumer=true").to("log:before")
-                        .process(new Processor() {
-                            public void process(Exchange exchange) throws Exception {
-                                if (exchange.getIn().getBody(String.class).equals("Hello Camel")) {
-                                    Thread.sleep(2000);
-                                }
-                            }
-                        }).to("log:after").to(MOCK_RESULT);
-            }
-        };
-    }
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
index 1332f7e..788d264 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
@@ -47,7 +47,7 @@ public class InOnlyTopicDurableConsumerTest extends JmsTestSupport {
     protected CamelContext createCamelContext() throws Exception {
         CamelContext context = super.createCamelContext();
         SjmsComponent sjms = context.getComponent("sjms", SjmsComponent.class);
-        sjms.setConnectionClientId(CONNECTION_ID);
+        sjms.setClientId(CONNECTION_ID);
         return context;
     }
 
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java
index 3822484..b45f712 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java
@@ -77,10 +77,10 @@ public class InOutConcurrentConsumerTest extends JmsTestSupport {
         return new RouteBuilder() {
             public void configure() throws Exception {
                 from("direct:start")
-                        .to("sjms:a?consumerCount=5&exchangePattern=InOut&replyTo=myResponse")
+                        .to("sjms:a?replyToConcurrentConsumers=5&replyTo=myResponse")
                         .to("mock:result");
 
-                from("sjms:a?consumerCount=5&exchangePattern=InOut&replyTo=myResponse")
+                from("sjms:a?concurrentConsumers=5")
                         .process(exchange -> {
                             String body = exchange.getIn().getBody(String.class);
                             // sleep a little to simulate heavy work and force concurrency processing
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java
index 0b89f96..15bccea 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.sjms.consumer;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.sjms.support.JmsTestSupport;
@@ -25,12 +26,12 @@ import org.junit.jupiter.api.Test;
 public class InOutConsumerQueueAsyncTest extends JmsTestSupport {
 
     @Test
-    public void testAynchronous() throws Exception {
+    public void testAsync() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Hello World", "Hello Camel");
 
         template.sendBody("sjms:start", "Hello Camel");
         template.sendBody("sjms:start", "Hello World");
-        Thread.sleep(4000);
+
         assertMockEndpointsSatisfied();
     }
 
@@ -39,10 +40,14 @@ public class InOutConsumerQueueAsyncTest extends JmsTestSupport {
         return new RouteBuilder() {
             public void configure() throws Exception {
                 from("sjms:queue:start?asyncConsumer=true")
-                        .to("sjms:queue:in.out.queue?replyTo=in.out.queue.response")
+                        .log("Requesting ${body} with thread ${threadName}")
+                        .to(ExchangePattern.InOut,
+                                "sjms:queue:in.out.queue?replyToConcurrentConsumers=2&replyTo=in.out.queue.response")
+                        .log("Result ${body} with thread ${threadName}")
                         .to("mock:result");
 
-                from("sjms:queue:in.out.queue?asyncConsumer=true").to("log:before")
+                from("sjms:queue:in.out.queue?concurrentConsumers=2").to("log:before")
+                        .log("Replying ${body} with thread ${threadName}")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws Exception {
                                 String body = (String) exchange.getIn().getBody();
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java
index a6c8478..0e94068 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.sjms.consumer;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.sjms.support.JmsTestSupport;
@@ -25,12 +26,12 @@ import org.junit.jupiter.api.Test;
 public class InOutConsumerTempQueueAsyncTest extends JmsTestSupport {
 
     @Test
-    public void testAynchronous() throws Exception {
+    public void testAsync() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Hello World", "Hello Camel");
 
-        template.requestBody("sjms:start", "Hello Camel");
-        template.requestBody("sjms:start", "Hello World");
-        Thread.sleep(5000);
+        template.sendBody("sjms:start", "Hello Camel");
+        template.sendBody("sjms:start", "Hello World");
+
         assertMockEndpointsSatisfied();
     }
 
@@ -39,10 +40,13 @@ public class InOutConsumerTempQueueAsyncTest extends JmsTestSupport {
         return new RouteBuilder() {
             public void configure() throws Exception {
                 from("sjms:queue:start?asyncConsumer=true")
-                        .to("sjms:queue:in.out.temp.queue")
+                        .log("Requesting ${body} with thread ${threadName}")
+                        .to(ExchangePattern.InOut, "sjms:queue:in.out.temp.queue?replyToConcurrentConsumers=2")
+                        .log("Result ${body} with thread ${threadName}")
                         .to("mock:result");
 
-                from("sjms:queue:in.out.temp.queue?asyncConsumer=true").to("log:before")
+                from("sjms:queue:in.out.temp.queue?concurrentConsumers=2").to("log:before")
+                        .log("Replying ${body} with thread ${threadName}")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws Exception {
                                 String body = (String) exchange.getIn().getBody();
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java
index a913e08..3a565da 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java
@@ -28,7 +28,7 @@ public class InOutSynchronousConsumerTest extends JmsTestSupport {
 
     private static String beforeThreadName;
     private static String afterThreadName;
-    private String url = "sjms:queue:in?replyTo=response.queue";
+    private String url = "sjms:queue:in?replyTo=response.queue&synchronous=true";
 
     @Test
     public void testSynchronous() throws Exception {
@@ -50,7 +50,7 @@ public class InOutSynchronousConsumerTest extends JmsTestSupport {
                         .to("log:after")
                         .to("mock:result");
 
-                from("sjms:queue:in?exchangePattern=InOut").process(exchange -> exchange.getMessage().setBody("Bye World"));
+                from("sjms:queue:in").process(exchange -> exchange.getMessage().setBody("Bye World"));
             }
         };
     }
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java
deleted file mode 100644
index c65accb..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.it;
-
-import java.util.concurrent.TimeUnit;
-
-import javax.jms.Connection;
-import javax.jms.Session;
-
-import org.apache.activemq.pool.PooledConnectionFactory;
-import org.apache.camel.CamelContext;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.sjms.SjmsComponent;
-import org.apache.camel.component.sjms.jms.ConnectionResource;
-import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.util.StopWatch;
-import org.junit.jupiter.api.Test;
-
-import static org.apache.camel.test.junit5.TestSupport.body;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-/**
- * Integration test that verifies we can replace the internal ConnectionFactoryResource with another provider.
- */
-public class ConnectionResourceIT extends JmsTestSupport {
-
-    /**
-     * Test method for {@link org.apache.commons.pool.ObjectPool#returnObject(java.lang.Object)} .
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testCreateConnections() throws Exception {
-        ConnectionResource pool = new AMQConnectionResource("tcp://localhost:33333", 1);
-        assertNotNull(pool);
-        Connection connection = pool.borrowConnection();
-        assertNotNull(connection);
-        assertNotNull(connection.createSession(false, Session.AUTO_ACKNOWLEDGE));
-        pool.returnConnection(connection);
-        Connection connection2 = pool.borrowConnection();
-        assertNotNull(connection2);
-    }
-
-    @Test
-    public void testConnectionResourceRouter() throws Exception {
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMessageCount(100);
-        mock.expectsNoDuplicates(body());
-
-        StopWatch watch = new StopWatch();
-
-        for (int i = 0; i < 100; i++) {
-            template.sendBody("seda:start", "" + i);
-        }
-
-        // just in case we run on slow boxes
-        assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
-
-        log.info("Took " + watch.taken() + " ms. to process 100 messages request/reply over JMS");
-    }
-
-    /*
-     * @see org.apache.camel.test.junit5.CamelTestSupport#createCamelContext()
-     * @return
-     * @throws Exception
-     */
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        CamelContext camelContext = new DefaultCamelContext();
-        AMQConnectionResource pool = new AMQConnectionResource("tcp://localhost:33333", 1);
-        SjmsComponent component = new SjmsComponent();
-        component.setConnectionResource(pool);
-        camelContext.addComponent("sjms", component);
-        return camelContext;
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-
-                from("seda:start")
-                        .to("sjms:queue:in.foo?replyTo=out.bar&exchangePattern=InOut")
-                        .to("mock:result");
-
-                from("sjms:queue:in.foo?exchangePattern=InOut&consumerCount=20")
-                        .log("Using ${threadName} to process ${body}")
-                        .transform(body().prepend("Bye "));
-            }
-        };
-    }
-
-    public class AMQConnectionResource implements ConnectionResource {
-        private PooledConnectionFactory pcf;
-
-        public AMQConnectionResource(String connectString, int maxConnections) {
-            pcf = new PooledConnectionFactory(connectString);
-            pcf.setMaxConnections(maxConnections);
-            pcf.start();
-        }
-
-        public void stop() {
-            pcf.stop();
-        }
-
-        @Override
-        public Connection borrowConnection() throws Exception {
-            Connection answer = pcf.createConnection();
-            answer.start();
-            return answer;
-        }
-
-        @Override
-        public void returnConnection(Connection connection) throws Exception {
-            // Do nothing in this case since the PooledConnectionFactory takes
-            // care of this for us
-            log.info("Connection returned");
-        }
-    }
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java
deleted file mode 100644
index b303027..0000000
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms.jms;
-
-import java.util.NoSuchElementException;
-
-import org.apache.activemq.ActiveMQConnection;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class ConnectionFactoryResourceTest {
-    private ActiveMQConnectionFactory connectionFactory;
-
-    @BeforeEach
-    public void setup() {
-        connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
-    }
-
-    @AfterEach
-    public void teardown() {
-        connectionFactory = null;
-    }
-
-    @Test
-    public void testCreateObject() throws Exception {
-        ConnectionFactoryResource pool = new ConnectionFactoryResource(1, connectionFactory);
-        pool.fillPool();
-        assertNotNull(pool);
-        ActiveMQConnection connection = (ActiveMQConnection) pool.makeObject();
-        assertNotNull(connection);
-        assertTrue(connection.isStarted());
-        pool.drainPool();
-    }
-
-    @Test
-    public void testDestroyObject() throws Exception {
-        ConnectionFactoryResource pool = new ConnectionFactoryResource(1, connectionFactory);
-        pool.fillPool();
-        assertNotNull(pool);
-        ActiveMQConnection connection = (ActiveMQConnection) pool.makeObject();
-        assertNotNull(connection);
-        assertTrue(connection.isStarted());
-        pool.drainPool();
-        assertEquals(0, pool.size());
-    }
-
-    @Test
-    public void testBorrowObject() throws Exception {
-        ConnectionFactoryResource pool = new ConnectionFactoryResource(1, connectionFactory);
-        pool.fillPool();
-        assertNotNull(pool);
-        ActiveMQConnection connection = (ActiveMQConnection) pool.borrowConnection();
-        assertNotNull(connection);
-        assertTrue(connection.isStarted());
-        assertThrows(NoSuchElementException.class,
-                pool::borrowConnection);
-    }
-
-    @Test
-    public void testReturnObject() throws Exception {
-        ConnectionFactoryResource pool = new ConnectionFactoryResource(1, connectionFactory);
-        pool.fillPool();
-        assertNotNull(pool);
-        ActiveMQConnection connection = (ActiveMQConnection) pool.borrowConnection();
-        assertNotNull(connection);
-        assertTrue(connection.isStarted());
-        pool.returnConnection(connection);
-        ActiveMQConnection connection2 = (ActiveMQConnection) pool.borrowConnection();
-        assertNotNull(connection2);
-        pool.drainPool();
-    }
-
-    @Test
-    public void testRoundRobbin() throws Exception {
-        ConnectionFactoryResource pool = new ConnectionFactoryResource(2, connectionFactory);
-        pool.fillPool();
-        assertNotNull(pool);
-        ActiveMQConnection connection = (ActiveMQConnection) pool.borrowConnection();
-        assertNotNull(connection);
-        assertTrue(connection.isStarted());
-        pool.returnConnection(connection);
-        ActiveMQConnection connection2 = (ActiveMQConnection) pool.borrowConnection();
-        assertNotNull(connection2);
-        assertNotEquals(connection, connection2);
-        pool.drainPool();
-    }
-}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
index 4a618d0..c5cfddc 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
@@ -119,7 +119,7 @@ public class InOutQueueProducerAsyncLoadTest extends JmsTestSupport {
                         .to("log:" + TEST_DESTINATION_NAME + ".in.log?showBody=true")
                         .to(ExchangePattern.InOut, "sjms:queue:" + TEST_DESTINATION_NAME + ".request" + "?replyTo="
                                                    + TEST_DESTINATION_NAME
-                                                   + ".response&consumerCount=10")
+                                                   + ".response&concurrentConsumers=10")
                         .threads(20)
                         .to("log:" + TEST_DESTINATION_NAME + ".out.log?showBody=true");
             }
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
index d575040..79dbe00 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
@@ -117,7 +117,7 @@ public class InOutQueueProducerSyncLoadTest extends JmsTestSupport {
                         .to("log:" + TEST_DESTINATION_NAME + ".in.log?showBody=true")
                         .to(ExchangePattern.InOut, "sjms:queue:" + TEST_DESTINATION_NAME + ".request" + "?replyTo="
                                                    + TEST_DESTINATION_NAME
-                                                   + ".response&consumerCount=20")
+                                                   + ".response&concurrentConsumers=20")
                         .to("log:" + TEST_DESTINATION_NAME + ".out.log?showBody=true");
             }
         };
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerTest.java
index 5507f03..a2cf7c4 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerTest.java
@@ -66,12 +66,6 @@ public class QueueProducerTest extends JmsTestSupport {
 
     }
 
-    /**
-     * @see              org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
-     *
-     * @return
-     * @throws Exception
-     */
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
index 7a484d6..062e7c4 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
@@ -33,13 +33,13 @@ public class TransactedConcurrentConsumersTest extends TransactedConsumerSupport
     public void testRoute() throws Exception {
         final String destinationName = "sjms:queue:one.consumer.one.route.test";
         int routeCount = 1;
-        int consumerCount = 2;
+        int concurrentConsumers = 2;
         int messageCount = 20;
         int maxAttemptsCount = 10;
         int totalRedeliverdFalse = 20;
         int totalRedeliveredTrue = 1;
         runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue,
-                consumerCount, maxAttemptsCount);
+                concurrentConsumers, maxAttemptsCount);
     }
 
     @Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java
index 38d8217..68dbf45 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java
@@ -38,7 +38,7 @@ public abstract class TransactedConsumerSupport extends CamelTestSupport {
 
     protected void runTest(
             String destinationName, int routeCount, int messageCount, int totalRedeliverdFalse, int totalRedeliveredTrue,
-            int consumerCount, int maxAttemptsCount)
+            int concurrentConsumers, int maxAttemptsCount)
             throws Exception {
         // The CountDownLatch is used to make our final assertions await
         // unit all the messages have been processed. It is also
@@ -48,7 +48,7 @@ public abstract class TransactedConsumerSupport extends CamelTestSupport {
 
         for (int i = 1; i <= routeCount; i++) {
             // We add a route here so we can pass our latch into it.
-            addRoute(destinationName, i, consumerCount, maxAttemptsCount, latch);
+            addRoute(destinationName, i, concurrentConsumers, maxAttemptsCount, latch);
             // Create mock endpoints for the before and after
             getMockEndpoint("mock:test.before." + i).expectedMessageCount(totalRedeliverdFalse);
             getMockEndpoint("mock:test.after." + i).expectedMessageCount(totalRedeliveredTrue);
@@ -89,7 +89,7 @@ public abstract class TransactedConsumerSupport extends CamelTestSupport {
     }
 
     protected void addRoute(
-            final String destinationName, final int routeNumber, final int consumerCount,
+            final String destinationName, final int routeNumber, final int concurrentConsumers,
             final int maxAttemptsCount, final CountDownLatch latch)
             throws Exception {
         context.addRoutes(new RouteBuilder() {
@@ -103,8 +103,8 @@ public abstract class TransactedConsumerSupport extends CamelTestSupport {
                 }
 
                 // Our test consumer route
-                from(destinationName + "?transacted=true&consumerCount="
-                     + consumerCount)
+                from(destinationName + "?transacted=true&concurrentConsumers="
+                     + concurrentConsumers)
                              .id("consumer.route." + routeNumber)
                              // first consume all the messages that are not redelivered
                              .choice().when(header("JMSRedelivered").isEqualTo("false"))
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java
index d8c1587..2075c40 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java
@@ -33,13 +33,13 @@ public class TransactedConsumersMultipleRouteTest extends TransactedConsumerSupp
     public void testRoute() throws Exception {
         final String destinationName = "sjms:queue:one.consumer.one.route.test";
         int routeCount = 2;
-        int consumerCount = 1;
+        int concurrentConsumers = 1;
         int messageCount = 20;
         int maxAttemptsCount = 10;
         int totalRedeliverdFalse = 10;
         int totalRedeliveredTrue = 1;
         runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue,
-                consumerCount, maxAttemptsCount);
+                concurrentConsumers, maxAttemptsCount);
     }
 
     @Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
index 27ab277..d9bc941 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
@@ -30,13 +30,13 @@ public class TransactedQueueConsumerTest extends TransactedConsumerSupport {
     public void testRoute() throws Exception {
         final String destinationName = "sjms:queue:one.consumer.one.route.tx.test";
         int routeCount = 1;
-        int consumerCount = 1;
+        int concurrentConsumers = 1;
         int messageCount = 20;
         int maxAttemptsCount = 10;
         int totalRedeliverdFalse = 20;
         int totalRedeliveredTrue = 1;
         runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue,
-                consumerCount, maxAttemptsCount);
+                concurrentConsumers, maxAttemptsCount);
     }
 
     @Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
index 4afe922..1de48c0 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
@@ -30,14 +30,13 @@ public class TransactedTopicConsumerTest extends TransactedConsumerSupport {
     public void testRoute() throws Exception {
         final String destinationName = "sjms:topic:one.consumer.one.route.tx.test";
         int routeCount = 2;
-        int consumerCount = 1;
-        int batchCount = 1;
+        int concurrentConsumers = 1;
         int messageCount = 20;
         int maxAttemptsCount = 10;
         int totalRedeliverdFalse = 20;
         int totalRedeliveredTrue = 1;
         runTest(destinationName, routeCount, messageCount, totalRedeliverdFalse, totalRedeliveredTrue,
-                consumerCount, maxAttemptsCount);
+                concurrentConsumers, maxAttemptsCount);
     }
 
     @Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
index 1b98985..dea5a9e 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
@@ -60,7 +60,7 @@ public class TransactedTopicProducerTest extends JmsTestSupport {
     protected CamelContext createCamelContext() throws Exception {
         CamelContext context = super.createCamelContext();
         SjmsComponent sjms = context.getComponent("sjms", SjmsComponent.class);
-        sjms.setConnectionClientId(CONNECTION_ID);
+        sjms.setClientId(CONNECTION_ID);
         return context;
     }
 
diff --git a/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java b/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java
index 0f1fa10..9ac71dc 100644
--- a/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java
+++ b/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java
@@ -20,52 +20,60 @@ public class Sjms2EndpointUriFactory extends org.apache.camel.support.component.
     private static final Set<String> PROPERTY_NAMES;
     private static final Set<String> SECRET_PROPERTY_NAMES;
     static {
-        Set<String> props = new HashSet<>(45);
-        props.add("shared");
-        props.add("reconnectBackOff");
-        props.add("connectionCount");
+        Set<String> props = new HashSet<>(53);
+        props.add("includeSentJMSMessageID");
+        props.add("asyncConsumer");
         props.add("mapJmsMessage");
         props.add("synchronous");
-        props.add("connectionResource");
         props.add("includeAllJMSXProperties");
-        props.add("explicitQosEnabled");
-        props.add("transacted");
         props.add("errorHandlerLogStackTrace");
-        props.add("durable");
+        props.add("eagerLoadingOfProperties");
         props.add("timeToLive");
         props.add("bridgeErrorHandler");
-        props.add("jmsKeyFormatStrategy");
         props.add("deliveryMode");
-        props.add("headerFilterStrategy");
+        props.add("transferException");
         props.add("exceptionListener");
-        props.add("destinationName");
-        props.add("messageCreatedStrategy");
-        props.add("asyncStopListener");
         props.add("destinationType");
         props.add("asyncStartListener");
-        props.add("requestTimeout");
-        props.add("allowNullBody");
-        props.add("replyToDeliveryPersistent");
-        props.add("disableReplyTo");
-        props.add("reconnectOnError");
-        props.add("consumerCount");
+        props.add("eagerPoisonBody");
+        props.add("replyToConcurrentConsumers");
         props.add("destinationCreationStrategy");
-        props.add("exchangePattern");
+        props.add("disableTimeToLive");
         props.add("messageSelector");
         props.add("deliveryPersistent");
-        props.add("preserveMessageQos");
         props.add("priority");
+        props.add("concurrentConsumers");
         props.add("acknowledgementMode");
         props.add("lazyStartProducer");
-        props.add("transactionCommitStrategy");
-        props.add("connectionFactory");
         props.add("replyTo");
         props.add("replyToOverride");
         props.add("errorHandlerLoggingLevel");
-        props.add("sharedJMSSession");
         props.add("durableSubscriptionId");
         props.add("subscriptionId");
         props.add("exceptionHandler");
+        props.add("shared");
+        props.add("connectionCount");
+        props.add("explicitQosEnabled");
+        props.add("transacted");
+        props.add("autoStartup");
+        props.add("durable");
+        props.add("jmsKeyFormatStrategy");
+        props.add("headerFilterStrategy");
+        props.add("destinationName");
+        props.add("messageCreatedStrategy");
+        props.add("asyncStopListener");
+        props.add("requestTimeout");
+        props.add("allowNullBody");
+        props.add("replyToDeliveryPersistent");
+        props.add("disableReplyTo");
+        props.add("recoveryInterval");
+        props.add("exchangePattern");
+        props.add("preserveMessageQos");
+        props.add("replyToType");
+        props.add("testConnectionOnStartup");
+        props.add("connectionFactory");
+        props.add("replyToSameDestinationAllowed");
+        props.add("sharedJMSSession");
         PROPERTY_NAMES = Collections.unmodifiableSet(props);
         SECRET_PROPERTY_NAMES = Collections.emptySet();
     }
diff --git a/components/camel-sjms2/src/generated/resources/org/apache/camel/component/sjms2/sjms2.json b/components/camel-sjms2/src/generated/resources/org/apache/camel/component/sjms2/sjms2.json
index 8117c35..4fe444a 100644
--- a/components/camel-sjms2/src/generated/resources/org/apache/camel/component/sjms2/sjms2.json
+++ b/components/camel-sjms2/src/generated/resources/org/apache/camel/component/sjms2/sjms2.json
@@ -25,21 +25,17 @@
     "connectionCount": { "kind": "property", "displayName": "Connection Count", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "description": "The maximum number of connections available to endpoints started under this component" },
     "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": true, "secret": false, "description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource." },
     "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
-    "reconnectBackOff": { "kind": "property", "displayName": "Reconnect Back Off", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 5000, "description": "Backoff in millis on consumer pool reconnection attempts" },
-    "reconnectOnError": { "kind": "property", "displayName": "Reconnect On Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Try to apply reconnection logic on consumer pool" },
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
     "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
-    "connectionClientId": { "kind": "property", "displayName": "Connection Client Id", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The client ID to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "connectionMaxWait": { "kind": "property", "displayName": "Connection Max Wait", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 5000, "description": "The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "connectionResource": { "kind": "property", "displayName": "Connection Resource", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.ConnectionResource", "deprecated": false, "autowired": false, "secret": false, "description": "A ConnectionResource is an interface that allows for customization and container control of the ConnectionFactory. See Plugable Connection Resource Management for further details." },
-    "connectionTestOnBorrow": { "kind": "property", "displayName": "Connection Test On Borrow", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource then should each javax.jms.Connection be tested before being used." },
     "destinationCreationStrategy": { "kind": "property", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
     "jmsKeyFormatStrategy": { "kind": "property", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The defau [...]
     "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
+    "recoveryInterval": { "kind": "property", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
+    "replyToOnTimeoutMaxConcurrentConsumers": { "kind": "property", "displayName": "Reply To On Timeout Max Concurrent Consumers", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request\/reply over JMS." },
+    "requestTimeoutCheckerInterval": { "kind": "property", "displayName": "Request Timeout Checker Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Configures how often Camel should check for timed out Exchanges when doing request\/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeou [...]
     "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
-    "connectionPassword": { "kind": "property", "displayName": "Connection Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "connectionUsername": { "kind": "property", "displayName": "Connection Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource." },
-    "transactionCommitStrategy": { "kind": "property", "displayName": "Transaction Commit Strategy", "group": "transaction", "label": "transaction", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.TransactionCommitStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To configure which kind of commit strategy to use. Camel provides two implementations out of the box, default and batch." }
+    "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
+    "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }
   },
   "properties": {
     "destinationType": { "kind": "path", "displayName": "Destination Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "queue", "topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "queue", "description": "The kind of destination to use" },
@@ -47,34 +43,40 @@
     "acknowledgementMode": { "kind": "parameter", "displayName": "Acknowledgement Mode", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.SessionAcknowledgementType", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "description": "The JMS acknowledgement name, which is one of:  [...]
     "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from  [...]
     "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
+    "testConnectionOnStartup": { "kind": "parameter", "displayName": "Test Connection On Startup", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel [...]
+    "asyncConsumer": { "kind": "parameter", "displayName": "Async Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asy [...]
+    "autoStartup": { "kind": "parameter", "displayName": "Auto Startup", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether the consumer container should auto-startup." },
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
-    "consumerCount": { "kind": "parameter", "displayName": "Consumer Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Sets the number of consumer listeners used for this endpoint." },
+    "concurrentConsumers": { "kind": "parameter", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the default number of concurrent consumers when consuming from JMS (not for request\/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up\/down of threads. When doing r [...]
     "durable": { "kind": "parameter", "displayName": "Durable", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets topic consumer to durable." },
     "durableSubscriptionId": { "kind": "parameter", "displayName": "Durable Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the durable subscription Id required for durable topics." },
-    "reconnectBackOff": { "kind": "parameter", "displayName": "Reconnect Back Off", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Backoff in millis on consumer pool reconnection attempts" },
-    "reconnectOnError": { "kind": "parameter", "displayName": "Reconnect On Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Try to apply reconnection logic on consumer pool" },
     "replyToDeliveryPersistent": { "kind": "parameter", "displayName": "Reply To Delivery Persistent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to use persistent delivery by default for replies." },
     "shared": { "kind": "parameter", "displayName": "Shared", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets the consumer to shared." },
     "subscriptionId": { "kind": "parameter", "displayName": "Subscription Id", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the subscription Id, required for durable or shared topics." },
-    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported)." },
+    "eagerLoadingOfProperties": { "kind": "parameter", "displayName": "Eager Loading Of Properties", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes c [...]
+    "eagerPoisonBody": { "kind": "parameter", "displayName": "Eager Poison Body", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Poison JMS message due to ${exception.message}", "description": "If eagerLoadingOfProperties is enabled and the JMS message payload (JMS body or JMS properties) is poison (cannot be read\/mapped), then se [...]
     "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
     "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
     "messageSelector": { "kind": "parameter", "displayName": "Message Selector", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the JMS Message selector syntax." },
+    "replyToSameDestinationAllowed": { "kind": "parameter", "displayName": "Reply To Same Destination Allowed", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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 c [...]
     "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2." },
     "deliveryPersistent": { "kind": "parameter", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether persistent delivery is used by default." },
     "explicitQosEnabled": { "kind": "parameter", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "description": "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 timeToLi [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
     "preserveMessageQos": { "kind": "parameter", "displayName": "Preserve Message Qos", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDelive [...]
     "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "description": "Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in orde [...]
+    "replyToConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the default number of concurrent consumers when doing request\/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up\/down of threads." },
     "replyToOverride": { "kind": "parameter", "displayName": "Reply To Override", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination." },
+    "replyToType": { "kind": "parameter", "displayName": "Reply To Type", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.ReplyToType", "enum": [ "Temporary", "Exclusive" ], "deprecated": false, "autowired": false, "secret": false, "description": "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 Exclusi [...]
     "requestTimeout": { "kind": "parameter", "displayName": "Request Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "20000", "description": "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 timeou [...]
     "timeToLive": { "kind": "parameter", "displayName": "Time To Live", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "description": "When sending messages, specifies the time-to-live of the message (in milliseconds)." },
     "allowNullBody": { "kind": "parameter", "displayName": "Allow Null Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an JMSException is thrown." },
+    "disableTimeToLive": { "kind": "parameter", "displayName": "Disable Time To Live", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Use this option to force disabling time to live. For example when you do request\/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message  [...]
+    "includeSentJMSMessageID": { "kind": "parameter", "displayName": "Include Sent JMSMessage ID", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was  [...]
     "asyncStartListener": { "kind": "parameter", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/o [...]
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to stop the consumer message listener asynchronously, when stopping a route." },
     "connectionCount": { "kind": "parameter", "displayName": "Connection Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "description": "The maximum number of connections available to this endpoint" },
     "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any" },
-    "connectionResource": { "kind": "parameter", "displayName": "Connection Resource", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.ConnectionResource", "deprecated": false, "autowired": false, "secret": false, "description": "Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any" },
     "destinationCreationStrategy": { "kind": "parameter", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
     "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
@@ -82,10 +84,12 @@
     "jmsKeyFormatStrategy": { "kind": "parameter", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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 pass [...]
     "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc. See section about how mapping works below for more details." },
     "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
+    "recoveryInterval": { "kind": "parameter", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
+    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
+    "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client i [...]
     "errorHandlerLoggingLevel": { "kind": "parameter", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "description": "Allows to configure the default errorHandler logging level for logging uncaught exceptions." },
     "errorHandlerLogStackTrace": { "kind": "parameter", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Allows to control whether stacktraces should be logged or not, by the default errorHandler." },
     "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to use transacted mode" },
-    "transactionCommitStrategy": { "kind": "parameter", "displayName": "Transaction Commit Strategy", "group": "transaction", "label": "transaction", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.TransactionCommitStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the commit strategy." },
     "sharedJMSSession": { "kind": "parameter", "displayName": "Shared JMSSession", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS provi [...]
   }
 }
diff --git a/components/camel-sjms2/src/main/docs/sjms2-component.adoc b/components/camel-sjms2/src/main/docs/sjms2-component.adoc
index 133a721..a638296 100644
--- a/components/camel-sjms2/src/main/docs/sjms2-component.adoc
+++ b/components/camel-sjms2/src/main/docs/sjms2-component.adoc
@@ -12,33 +12,22 @@ include::{cq-version}@camel-quarkus:ROOT:partial$reference/components/sjms2.adoc
 
 *{component-header}*
 
-The Simple JMS 2.0 Component, or SJMS2, is a JMS client for use with Camel
-that uses well known best practices when it comes to JMS client creation
-and configuration. SJMS2 contains a brand new JMS 2.0 client API written
-explicitly for Camel eliminating third party messaging implementations
-keeping it light and resilient. The following features is included:
-
-* Standard Queue and Topic Support (Durable & Non-Durable)
-* InOnly & InOut MEP Support
-* Asynchronous Producer and Consumer Processing
-* Internal JMS Transaction Support
-
-Additional key features include:
-
-* Plugable Connection Resource Management
-* Session, Consumer, & Producer Pooling & Caching Management
-* Batch Consumers and Producers
-* Transacted Batch Consumers & Producers
-* Support for Customizable Transaction Commit Strategies (Local JMS
-Transactions only)
+The Simple JMS Component is a JMS component that only uses JMS APIs
+and no 3rd-party framework such as Spring JMS.
 
-[NOTE]
-====
-*Why the S in SJMS*
+The component was reworked from Camel 3.8 onwards
+to be similar to the existing Camel JMS component that is based on Spring JMS.
 
-S stands for Simple and Standard and Springless. Also camel-jms was
-already taken.
-====
+The reason is to offer many of the same features and functionality from the JMS component,
+but for users that requires lightweight without having to include the Spring Framework.
+
+There are some advanced features in the Spring JMS component that has been omitted, such as
+shared queues for request/reply. Spring JMS offers fine grained tunings for concurrency settings,
+which can be tweaked for dynamic scaling up and down depending on load. This is a special feature in Spring JMS
+that would require substantial code to implement in SJMS2.
+
+The SJMS2 component does not support for Spring or JTA Transaction, however support for internal local transactions
+is supported using JMS or Transaction or Client Acknowledge Mode. See more further below.
 
 Maven users will need to add the following dependency to their `pom.xml`
 for this component:
@@ -55,7 +44,7 @@ for this component:
 
 == URI format
 
-[source]
+[source,text]
 ----
 sjms2:[queue:|topic:]destinationName[?options]
 ----
@@ -64,14 +53,14 @@ Where `destinationName` is a JMS queue or topic name. By default, the
 `destinationName` is interpreted as a queue name. For example, to
 connect to the queue, `FOO.BAR` use:
 
-[source]
+[source,text]
 ----
 sjms2:FOO.BAR
 ----
 
 You can include the optional `queue:` prefix, if you prefer:
 
-[source]
+[source,text]
 ----
 sjms2:queue:FOO.BAR
 ----
@@ -79,7 +68,7 @@ sjms2:queue:FOO.BAR
 To connect to a topic, you _must_ include the `topic:` prefix. For
 example, to connect to the topic, `Stocks.Prices`, use:
 
-[source]
+[source,text]
 ----
 sjms2:topic:Stocks.Prices
 ----
@@ -89,11 +78,8 @@ You append query options to the URI using the following format,
 
 == Component Options and Configurations
 
-
-
-
 // component options: START
-The Simple JMS2 component supports 18 options, which are listed below.
+The Simple JMS2 component supports 14 options, which are listed below.
 
 
 
@@ -103,31 +89,21 @@ The Simple JMS2 component supports 18 options, which are listed below.
 | *connectionCount* (common) | The maximum number of connections available to endpoints started under this component | 1 | Integer
 | *connectionFactory* (common) | *Autowired* A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource. |  | ConnectionFactory
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
-| *reconnectBackOff* (consumer) | Backoff in millis on consumer pool reconnection attempts | 5000 | long
-| *reconnectOnError* (consumer) | Try to apply reconnection logic on consumer pool | true | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
-| *connectionClientId* (advanced) | The client ID to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
-| *connectionMaxWait* (advanced) | The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. | 5000 | long
-| *connectionResource* (advanced) | A ConnectionResource is an interface that allows for customization and container control of the ConnectionFactory. See Plugable Connection Resource Management for further details. |  | ConnectionResource
-| *connectionTestOnBorrow* (advanced) | When using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource then should each javax.jms.Connection be tested before being used. | true | boolean
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *jmsKeyFormatStrategy* (advanced) | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The default strategy will safely marshal dots and hyphens (. and -). 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  [...]
 | *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
+| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
+| *replyToOnTimeoutMaxConcurrent{zwsp}Consumers* (advanced) | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS. | 1 | int
+| *requestTimeoutCheckerInterval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
-| *connectionPassword* (security) | The password to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
-| *connectionUsername* (security) | The username to use when creating javax.jms.Connection when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource. |  | String
-| *transactionCommitStrategy* (transaction) | To configure which kind of commit strategy to use. Camel provides two implementations out of the box, default and batch. |  | TransactionCommitStrategy
+| *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
+| *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 |===
 // component options: END
 
 
-
-
-
-
-
-
 // endpoint options: START
 The Simple JMS2 endpoint is configured using URI syntax:
 
@@ -148,7 +124,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (43 parameters):
+=== Query Parameters (51 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -157,34 +133,40 @@ with the following path and query parameters:
 | *acknowledgementMode* (common) | The JMS acknowledgement name, which is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. There are 4 enums and the value can be one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE | SessionAcknowledgementType
 | *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message broker [...]
 | *replyTo* (common) | Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer). |  | String
+| *testConnectionOnStartup* (common) | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | boolean
+| *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue, while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100% strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transac [...]
+| *autoStartup* (consumer) | Specifies whether the consumer container should auto-startup. | true | boolean
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
-| *consumerCount* (consumer) | Sets the number of consumer listeners used for this endpoint. | 1 | int
+| *concurrentConsumers* (consumer) | Specifies the default number of concurrent consumers when consuming from JMS (not for request/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. When doing request/reply over JMS then the option replyToConcurrentConsumers is used to control number of concurrent consumers on the reply message listener. | 1 | int
 | *durable* (consumer) | Sets topic consumer to durable. | false | boolean
 | *durableSubscriptionId* (consumer) | Sets the durable subscription Id required for durable topics. |  | String
-| *reconnectBackOff* (consumer) | Backoff in millis on consumer pool reconnection attempts | 5000 | long
-| *reconnectOnError* (consumer) | Try to apply reconnection logic on consumer pool | true | boolean
 | *replyToDeliveryPersistent* (consumer) | Specifies whether to use persistent delivery by default for replies. | true | boolean
 | *shared* (consumer) | Sets the consumer to shared. | false | boolean
 | *subscriptionId* (consumer) | Sets the subscription Id, required for durable or shared topics. |  | String
-| *synchronous* (consumer) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | true | boolean
+| *eagerLoadingOfProperties* (consumer) | Enables eager loading of JMS properties and payload as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes can catch early any issues with the underlying JMS provider and the use of JMS properties. See also the option eagerPoisonBody. | false | boolean
+| *eagerPoisonBody* (consumer) | If eagerLoadingOfProperties is enabled and the JMS message payload (JMS body or JMS properties) is poison (cannot be read/mapped), then set this text as the message body instead so the message can be processed (the cause of the poison are already stored as exception on the Exchange). This can be turned off by setting eagerPoisonBody=false. See also the option eagerLoadingOfProperties. | Poison JMS message due to ${exception.message} | String
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
 | *messageSelector* (consumer) | Sets the JMS Message selector syntax. |  | String
+| *replyToSameDestinationAllowed* (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
 | *deliveryMode* (producer) | Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2. There are 2 enums and the value can be one of: 1, 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
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *preserveMessageQos* (producer) | Set to true, if you want to send message using the QoS settings specified on the message, instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority, JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. If not provided, Camel will fall back to use the values from the endpoint instead. So, when using this option, the headers override the values from the endpoint. The explicitQosEnable [...]
 | *priority* (producer) | Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 8, 9 | 4 | int
+| *replyToConcurrentConsumers* (producer) | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. | 1 | int
 | *replyToOverride* (producer) | Provides an explicit ReplyTo destination in the JMS message, which overrides the setting of replyTo. It is useful if you want to forward the message to a remote Queue and receive the reply message from the ReplyTo destination. |  | String
+| *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  [...]
 | *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
 | *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
+| *disableTimeToLive* (producer) | Use this option to force disabling time to live. For example when you do request/reply over JMS, then Camel will by default use the requestTimeout value as time to live on the message being sent. The problem is that the sender and receiver systems have to have their clocks synchronized, so they are in sync. This is not always so easy to archive. So you can use disableTimeToLive=true to not set a time to live value on the sent message. Then the message w [...]
+| *includeSentJMSMessageID* (producer) | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination. | false | boolean
 | *asyncStartListener* (advanced) | Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, then b [...]
 | *asyncStopListener* (advanced) | Whether to stop the consumer message listener asynchronously, when stopping a route. | false | boolean
 | *connectionCount* (advanced) | *Deprecated* The maximum number of connections available to this endpoint |  | Integer
 | *connectionFactory* (advanced) | Initializes the connectionFactory for the endpoint, which takes precedence over the component's connectionFactory, if any |  | ConnectionFactory
-| *connectionResource* (advanced) | Initializes the connectionResource for the endpoint, which takes precedence over the component's connectionResource, if any |  | ConnectionResource
 | *destinationCreationStrategy* (advanced) | To use a custom DestinationCreationStrategy. |  | DestinationCreationStrategy
 | *exceptionListener* (advanced) | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. |  | ExceptionListener
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
@@ -192,325 +174,112 @@ with the following path and query parameters:
 | *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 [...]
 | *mapJmsMessage* (advanced) | Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc. See section about how mapping works below for more details. | true | boolean
 | *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
+| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
+| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. There are 6 enums and the value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
-| *transactionCommitStrategy* (transaction) | Sets the commit strategy. |  | TransactionCommitStrategy
 | *sharedJMSSession* (transaction) | Specifies whether to share JMS session with other SJMS endpoints. Turn this off if your route is accessing to multiple JMS providers. If you need transaction against multiple JMS providers, use jms component to leverage XA transaction. | true | boolean
 |===
 // endpoint options: END
 
 
+Below is an example of how to configure the `SjmsComponent` with its
+required `ConnectionFactory` provider.
 
 
+== Reuse endpoint and send to different destinations computed at runtime
 
+If you need to send messages to a lot of different JMS destinations, it
+makes sense to reuse a SJMS endpoint and specify the real destination in
+a message header. This allows Camel to reuse the same endpoint, but send
+to different destinations. This greatly reduces the number of endpoints
+created and economizes on memory and thread resources.
 
-Below is an example of how to configure the `Sjms2Component` with its
-required `ConnectionFactory` provider. It will create a single connection
-by default and store it using the component's internal pooling APIs to
-ensure that it is able to service Session creation requests in a thread
-safe manner.
-
-[source,java]
-----
-Sjms2Component component = new Sjms2Component();
-component.setConnectionFactory(new ActiveMQConnectionFactory("tcp://localhost:61616"));
-getContext().addComponent("sjms2", component);
-----
-
-For a SJMS2 component that is required to support a durable subscription,
-you can override the default `ConnectionFactoryResource` instance and set
-the `clientId` property.
-
-[source,java]
-----
-ConnectionFactoryResource connectionResource = new ConnectionFactoryResource();
-connectionResource.setConnectionFactory(new ActiveMQConnectionFactory("tcp://localhost:61616"));
-connectionResource.setClientId("myclient-id");
-
-Sjms2Component component = new Sjms2Component();
-component.setConnectionResource(connectionResource);
-component.setMaxConnections(1);
-----
+TIP: Using xref:{eip-vc}:eips:toD-eip.adoc[toD] is easier than specifying the dynamic destination with a header
 
-== Producer Usage
+You can specify the destination in the following headers:
 
-=== InOnly Producer - (Default)
+[width="100%",cols="10%,10%,80%",options="header",]
+|=====================================================================
+|Header |Type |Description
+|`CamelJmsDestinationName` |`String` |The destination name.
+|=====================================================================
 
-The _InOnly_ producer is the default behavior of the SJMS2 Producer
-Endpoint.
+For example, the following route shows how you can compute a destination
+at run time and use it to override the destination appearing in the JMS
+URL:
 
 [source,java]
-----
-from("direct:start")
-    .to("sjms2:queue:bar");
-----
-
-=== InOut Producer
-
-To enable _InOut_ behavior append the `exchangePattern` attribute to the
-URI. By default it will use a dedicated TemporaryQueue for each
-consumer.
-
-[source,java]
-----
-from("direct:start")
-    .to("sjms2:queue:bar?exchangePattern=InOut");
-----
-
-You can specify a `replyTo` though which can provide a better
-monitor point.
-
-[source,java]
-----
-from("direct:start")
-    .to("sjms2:queue:bar?replyTo=my.reply.to.queue");
-----
+--------------------------------
+from("file://inbox")
+  .to("bean:computeDestination")
+  .to("sjms2:queue:dummy");
+--------------------------------
 
-== Consumer Usage
+The queue name, `dummy`, is just a placeholder. It must be provided as
+part of the JMS endpoint URL, but it will be ignored in this example.
 
-=== Durable Shared Subscription
-
-To create a durable subscription that can be shared between one or more consumers.
-Use a JMS 2.0 compliant connection factory and specify a common subscriptionId. Then set the subscription properties durable and shared to true.
-
-[source,java]
-----
-from("sjms2:topic:foo?consumerCount=3&subscriptionId=bar&durable=true&shared=true")
-    .to("mock:result");
-
-from("sjms2:topic:foo?consumerCount=2&subscriptionId=bar&durable=true&shared=true")
-    .to("mock:result");
-----
-
-=== InOnly Consumer - (Default)
-
-The _InOnly_ xonsumer is the default Exchange behavior of the SJMS2
-Consumer Endpoint.
+In the `computeDestination` bean, specify the real destination by
+setting the `CamelJmsDestinationName` header as follows:
 
 [source,java]
-----
-from("sjms2:queue:bar")
-    .to("mock:result");
-----
-
-=== InOut Consumer
-
-To enable _InOut_ behavior append the `exchangePattern` attribute to the
-URI.
-
-[source,java]
-----
-from("sjms2:queue:in.out.test?exchangePattern=InOut")
-    .transform(constant("Bye Camel"));
-----
-
-== Advanced Usage Notes
-
-=== Plugable Connection Resource Management [[SJMS2-connectionresource]]
-
-SJMS2 provides JMS
-http://docs.oracle.com/javaee/5/api/javax/jms/Connection.html[`Connection`]
-resource management through built-in connection pooling. This eliminates
-the need to depend on third party API pooling logic. However there may
-be times that you are required to use an external Connection resource
-manager such as those provided by J2EE or OSGi containers. For this SJMS2
-provides an interface that can be used to override the internal SJMS2
-Connection pooling capabilities. This is accomplished through the
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionResource.java[`ConnectionResource`]
-interface.
-
-The
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionResource.java[`ConnectionResource`]
-provides methods for borrowing and returning Connections as needed is
-the contract used to provide
-http://docs.oracle.com/javaee/5/api/javax/jms/Connection.html[`Connection`]
-pools to the SJMS2 component. A user should use when it is necessary to
-integrate SJMS2 with an external connection pooling manager.
-
-It is recommended though that for standard
-http://docs.oracle.com/javaee/5/api/javax/jms/ConnectionFactory.html[`ConnectionFactory`]
-providers you use the
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java[`ConnectionFactoryResource`]
-implementation that is provided with SJMS2 as-is or extend as it is
-optimized for this component.
-
-Below is an example of using the plugable ConnectionResource with the
-ActiveMQ `PooledConnectionFactory`:
-
-[source,java]
-----
-public class AMQConnectionResource implements ConnectionResource {
-    private PooledConnectionFactory pcf;
-
-    public AMQConnectionResource(String connectString, int maxConnections) {
-        super();
-        pcf = new PooledConnectionFactory(connectString);
-        pcf.setMaxConnections(maxConnections);
-        pcf.start();
-    }
-
-    public void stop() {
-        pcf.stop();
-    }
-
-    @Override
-    public Connection borrowConnection() throws Exception {
-        Connection answer = pcf.createConnection();
-        answer.start();
-        return answer;
-    }
-
-    @Override
-    public Connection borrowConnection(long timeout) throws Exception {
-        // SNIPPED...
-    }
-
-    @Override
-    public void returnConnection(Connection connection) throws Exception {
-        // Do nothing since there isn't a way to return a Connection
-        // to the instance of PooledConnectionFactory
-        log.info("Connection returned");
-    }
+-------------------------------------------------------------------------
+public void setJmsHeader(Exchange exchange) {
+   String id = ....
+   exchange.getIn().setHeader("CamelJmsDestinationName", "order:" + id");
 }
-----
-
-Then pass in the `ConnectionResource` to the `Sjms2Component`:
-
-[source,java]
-----
-CamelContext camelContext = new DefaultCamelContext();
-AMQConnectionResource pool = new AMQConnectionResource("tcp://localhost:33333", 1);
-Sjms2Component component = new Sjms2Component();
-component.setConnectionResource(pool);
-camelContext.addComponent("sjms2", component);
-----
-
-To see the full example of its usage please refer to the
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java[`ConnectionResourceIT`].
-
-=== Session, Consumer, & Producer Pooling & Caching Management
-
-Coming soon ...
-
-=== Batch Message Support
+-------------------------------------------------------------------------
 
-The Sjms2Producer supports publishing a collection of messages by
-creating an Exchange that encapsulates a `List`. This Sjms2Producer will
-take then iterate through the contents of the List and publish each
-message individually.
+Then Camel will read this header and use it as the destination instead
+of the one configured on the endpoint. So, in this example Camel sends
+the message to `sjms2:queue:order:2`, assuming the `id` value was 2.
 
-If when producing a batch of messages there is the need to set headers
-that are unique to each message you can use the SJMS2
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java[`BatchMessage`]
-class. When the Sjms2Producer encounters a `BatchMessage` list it will
-iterate each `BatchMessage` and publish the included payload and headers.
+Keep in mind that the JMS producer removes both `CamelJmsDestinationName`
+headers from the exchange and do not propagate  them to the created JMS
+message in order to avoid the accidental loops
+in the routes (in scenarios when the message will be forwarded to the
+another JMS endpoint).
 
-Below is an example of using the BatchMessage class. First we create a
-list of `BatchMessage`:
+== Using toD
 
-[source,java]
-----
-List<BatchMessage<String>> messages = new ArrayList<BatchMessage<String>>();
-for (int i = 1; i <= messageCount; i++) {
-    String body = "Hello World " + i;
-    BatchMessage<String> message = new BatchMessage<String>(body, null);
-    messages.add(message);
-}
-----
+If you need to send messages to a lot of different JMS destinations, it
+makes sense to reuse a SJMS2 endpoint and specify the dynamic destinations
+with simple language using xref:{eip-vc}:eips:toD-eip.adoc[toD].
 
-Then publish the list:
+For example suppose you need to send messages to queues with order types,
+then using toD could for example be done as follows:
 
 [source,java]
-----
-template.sendBody("sjms2:queue:batch.queue", messages);
-----
+--------------------------------
+from("direct:order")
+  .toD("sjms2:order-${header.orderType}");
+--------------------------------
 
-=== Customizable Transaction Commit Strategies (Local JMS Transactions only)
-
-SJMS2 provides a developer the means to create a custom and plugable
-transaction strategy through the use of the
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionCommitStrategy.java[`TransactionCommitStrategy`]
-interface. This allows a user to define a unique set of circumstances
-that the
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java[`SessionTransactionSynchronization`]
-will use to determine when to commit the Session. An example of its use
-is the
-https://svn.apache.org/repos/asf/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java[`BatchTransactionCommitStrategy`]
-which is detailed further in the next section.
-
-=== Transacted Batch Consumers & Producers
-
-The SJMS2 component has been designed to support the batching of local JMS
-transactions on both the Producer and Consumer endpoints. How they are
-handled on each is very different though.
-
-The SJMS2 consumer endpoint is a straightforward implementation that will
-process X messages before committing them with the associated Session.
-To enable batched transaction on the consumer first enable transactions
-by setting the `transacted` parameter to true and then adding the
-`transactionBatchCount` and setting it to any value that is greater than
-0. For example the following configuration will commit the Session every
-10 messages:
-
-[source]
-----
-sjms2:queue:transacted.batch.consumer?transacted=true&transactionBatchCount=10
-----
-
-If an exception occurs during the processing of a batch on the consumer
-endpoint, the Session rollback is invoked causing the messages to be
-redelivered to the next available consumer. The counter is also reset to
-0 for the `BatchTransactionCommitStrategy` for the associated Session as
-well. It is the responsibility of the user to ensure they put hooks in
-their processors of batch messages to watch for messages with the
-JMSRedelivered header set to true. This is the indicator that messages
-were rolled back at some point and that a verification of a successful
-processing should occur.
-
-A transacted batch consumer also carries with it an instance of an
-internal timer that waits a default amount of time (5000ms) between
-messages before committing the open transactions on the Session. The
-default value of 5000ms (minimum of 1000ms) should be adequate for most
-use-cases but if further tuning is necessary simply set the
-`transactionBatchTimeout` parameter.
-
-[source]
-----
-sjms2:queue:transacted.batch.consumer?transacted=true&transactionBatchCount=10&transactionBatchTimeout=2000
-----
+== Additional Notes
 
-The minimal value that will be accepted is 1000ms as the amount of
-context switching may cause unnecessary performance impacts without
-gaining benefit.
+=== Local transactions
 
-The producer endpoint is handled much differently though. With the
-producer after each message is delivered to its destination the Exchange
-is closed and there is no longer a reference to that message. To make a
-available all the messages available for redelivery you simply enable
-transactions on a Producer Endpoint that is publishing BatchMessages.
-The transaction will commit at the conclusion of the exchange which
-includes all messages in the batch list. Nothing additional need be
-configured. For example:
+When using `transacted=true` then JMS Transacted Acknowledge Mode are in use.
+The SJMS2 component supports this from both the consumer and producers. If a consumer
+is transacted, then the active JMS Session will commit or rollback at the end of processing the message.
 
-[source,java]
-----
-List<BatchMessage<String>> messages = new ArrayList<BatchMessage<String>>();
-for (int i = 1; i <= messageCount; i++) {
-    String body = "Hello World " + i;
-    BatchMessage<String> message = new BatchMessage<String>(body, null);
-    messages.add(message);
-}
-----
+SJMS2 producers that are `transacted=true` will also defer until the end of processing the message
+before the the active JMS Session will commit or rollback.
 
-Now publish the List with transactions enabled:
+You can combine consumer and producer, such as:
 
 [source,java]
 ----
-template.sendBody("sjms2:queue:batch.queue?transacted=true", messages);
+from("sjms2:cheese?transacted=true")
+  .to("bean:foo")
+  .to("sjms2:foo?transacted=true")
+  .to("bean:bar");
 ----
 
-== Additional Notes
+Here the consumer and producer are both transacted, which means that only at the end of processing the message,
+then both the consumer and the producer will commit (or rollback in case of an exception during routing).
 
 === Message Header Format
 
@@ -530,12 +299,8 @@ messages:
 ** is replaced by _DOT_ and the reverse replacement when Camel consumes
 the message.
 ** is replaced by _HYPHEN_ and the reverse replacement when Camel
-consumes the message. +
-See also the option `jmsKeyFormatStrategy`, which allows use of your own
-custom strategy for formatting keys.
-
-For the `exchange.in.header`, the following rules apply for the header
-values:
+consumes the message.See also the option `jmsKeyFormatStrategy`,
+which allows use of your own custom strategy for formatting keys.
 
 === Message Content
 
@@ -550,40 +315,19 @@ dropped.
 === Clustering
 
 When using _InOut_ with SJMS2 in a clustered environment you must either
-use TemporaryQueue destinations or use a unique named reply to
+use TemporaryQueue destinations or use a unique reply to
 destination per InOut producer endpoint. Message correlation is handled
-by the endpoint, not with message selectors at the broker. The InOut
-Producer Endpoint uses Java Concurrency Exchangers cached by the Message
-`JMSCorrelationID`. This provides a nice performance increase while
-reducing the overhead on the broker since all the messages are consumed
-from the destination in the order they are produced by the interested
-consumer.
+by the producer, not with message selectors at the broker.
+
+[NOTE]
+====
+You should only use queues as reply-to destination types, topics is not recommended or fully supported.
+====
 
 Currently the only correlation strategy is to use the `JMSCorrelationId`.
 The _InOut_ Consumer uses this strategy as well ensuring that all
 responses messages to the included `JMSReplyTo` destination also have the
 `JMSCorrelationId` copied from the request as well.
 
-== Transaction Support [[SJMS2-transactions]]
-
-SJMS2 currently only supports the use of internal JMS Transactions. There
-is no support for the Camel Transaction Processor or the Java
-Transaction API (JTA).
-
-=== Does Springless Mean I Can't Use Spring?
-
-Not at all. Below is an example of the SJMS2 component using the XML DSL:
-
-[source,xml]
-----
-<route>
-    <from uri="direct:invoke.named.reply.to.queue" />
-    <to uri="sjms2:queue:named.reply.to.queue?replyTo=my.response.queue" />
-</route>
-----
-
-Springless refers to moving away from the dependency on the Spring JMS
-API. A new JMS client API is being developed from the ground up to power
-SJMS2.
 
 include::camel-spring-boot::page$sjms2-starter.adoc[]
diff --git a/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/jms/Jms2ObjectFactory.java b/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/jms/Jms2ObjectFactory.java
index 1a11567..725dab0 100644
--- a/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/jms/Jms2ObjectFactory.java
+++ b/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/jms/Jms2ObjectFactory.java
@@ -25,6 +25,7 @@ import javax.jms.Session;
 import javax.jms.Topic;
 
 import org.apache.camel.Endpoint;
+import org.apache.camel.component.sjms.SjmsEndpoint;
 import org.apache.camel.component.sjms.jms.JmsObjectFactory;
 import org.apache.camel.component.sjms2.Sjms2Endpoint;
 import org.apache.camel.util.ObjectHelper;
@@ -50,6 +51,11 @@ public class Jms2ObjectFactory implements JmsObjectFactory {
     }
 
     @Override
+    public MessageConsumer createQueueMessageConsumer(Session session, Destination destination) throws Exception {
+        return createMessageConsumer(session, destination, null, false, null, false, false);
+    }
+
+    @Override
     public MessageConsumer createMessageConsumer(
             Session session, Destination destination,
             String messageSelector, boolean topic, String subscriptionId, boolean durable,
@@ -192,6 +198,18 @@ public class Jms2ObjectFactory implements JmsObjectFactory {
     }
 
     @Override
+    public MessageProducer createMessageProducer(Session session, Endpoint endpoint, Destination destination) throws Exception {
+        SjmsEndpoint sjmsEndpoint = (SjmsEndpoint) endpoint;
+
+        boolean persistent = sjmsEndpoint.isDeliveryPersistent();
+        if (sjmsEndpoint.getDeliveryMode() != null) {
+            persistent = DeliveryMode.PERSISTENT == sjmsEndpoint.getDeliveryMode();
+        }
+
+        return createMessageProducer(session, destination, persistent, sjmsEndpoint.getTimeToLive());
+    }
+
+    @Override
     public MessageProducer createMessageProducer(
             Session session, Destination destination,
             boolean persistent, long ttl)
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointConnectionSettingsTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointConnectionSettingsTest.java
deleted file mode 100644
index c5cfa04..0000000
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointConnectionSettingsTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.sjms2;
-
-import java.util.Random;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
-import org.apache.camel.component.sjms.jms.ConnectionFactoryResource;
-import org.apache.camel.component.sjms.jms.ConnectionResource;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class Sjms2EndpointConnectionSettingsTest extends CamelTestSupport {
-    private final ActiveMQConnectionFactory connectionFactory
-            = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
-    private final ConnectionResource connectionResource = new ConnectionFactoryResource(2, connectionFactory);
-
-    @Test
-    public void testConnectionFactory() {
-        Endpoint endpoint = context.getEndpoint("sjms2:queue:test?connectionFactory=#activemq");
-        assertNotNull(endpoint);
-        assertTrue(endpoint instanceof Sjms2Endpoint);
-        Sjms2Endpoint qe = (Sjms2Endpoint) endpoint;
-        assertEquals(connectionFactory, qe.getConnectionFactory());
-    }
-
-    @Test
-    public void testConnectionResource() {
-        Endpoint endpoint = context.getEndpoint("sjms2:queue:test?connectionResource=#connresource");
-        assertNotNull(endpoint);
-        assertTrue(endpoint instanceof Sjms2Endpoint);
-        Sjms2Endpoint qe = (Sjms2Endpoint) endpoint;
-        assertEquals(connectionResource, qe.getConnectionResource());
-    }
-
-    @Test
-    public void testConnectionCount() {
-        Random random = new Random();
-        int poolSize = random.nextInt(100);
-        Endpoint endpoint = context.getEndpoint("sjms2:queue:test?connectionCount=" + poolSize);
-        assertNotNull(endpoint);
-        assertTrue(endpoint instanceof Sjms2Endpoint);
-        Sjms2Endpoint qe = (Sjms2Endpoint) endpoint;
-        assertEquals(poolSize, qe.getConnectionCount());
-    }
-
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        SimpleRegistry registry = new SimpleRegistry();
-        registry.bind("activemq", connectionFactory);
-        registry.bind("connresource", connectionResource);
-        return new DefaultCamelContext(registry);
-    }
-}
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java
index 86ef372..73a41cd 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java
@@ -16,11 +16,9 @@
  */
 package org.apache.camel.component.sjms2.consumer;
 
-import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.sjms.jms.ConnectionFactoryResource;
 import org.apache.camel.component.sjms2.Sjms2Component;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
@@ -28,7 +26,6 @@ import org.junit.jupiter.api.Test;
 public class InOnlyTopicDurableConsumerTest extends CamelTestSupport {
 
     private static final String CONNECTION_ID = "test-connection-1";
-    private static final String BROKER_URI = "vm://durable.broker?broker.persistent=false&broker.useJmx=false";
 
     @Override
     protected boolean useJmx() {
@@ -51,24 +48,12 @@ public class InOnlyTopicDurableConsumerTest extends CamelTestSupport {
         assertMockEndpointsSatisfied();
     }
 
-    /*
-     * @see org.apache.camel.test.junit5.CamelTestSupport#createCamelContext()
-     *
-     * @return
-     * @throws Exception
-     */
     @Override
     protected CamelContext createCamelContext() throws Exception {
-        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(BROKER_URI);
-        ConnectionFactoryResource connectionResource = new ConnectionFactoryResource();
-        connectionResource.setConnectionFactory(connectionFactory);
-        connectionResource.setClientId(CONNECTION_ID);
-        CamelContext camelContext = super.createCamelContext();
-        Sjms2Component component = new Sjms2Component();
-        component.setConnectionResource(connectionResource);
-        component.setConnectionCount(1);
-        camelContext.addComponent("sjms2", component);
-        return camelContext;
+        CamelContext context = super.createCamelContext();
+        Sjms2Component sjms = context.getComponent("sjms2", Sjms2Component.class);
+        sjms.setClientId(CONNECTION_ID);
+        return context;
     }
 
     @Override
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicSharedConsumerTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicSharedConsumerTest.java
index df4aaac..ba2d897 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicSharedConsumerTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicSharedConsumerTest.java
@@ -47,12 +47,6 @@ public class InOnlyTopicSharedConsumerTest extends Jms2TestSupport {
         mock2.assertIsSatisfied();
     }
 
-    /**
-     * @see              org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
-     *
-     * @return
-     * @throws Exception
-     */
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java
index f3ee320..6e01843 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java
@@ -107,36 +107,6 @@ public interface Sjms2ComponentBuilderFactory {
             return this;
         }
         /**
-         * Backoff in millis on consumer pool reconnection attempts.
-         * 
-         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
-         * 
-         * Default: 5000
-         * Group: consumer
-         * 
-         * @param reconnectBackOff the value to set
-         * @return the dsl builder
-         */
-        default Sjms2ComponentBuilder reconnectBackOff(long reconnectBackOff) {
-            doSetProperty("reconnectBackOff", reconnectBackOff);
-            return this;
-        }
-        /**
-         * Try to apply reconnection logic on consumer pool.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: consumer
-         * 
-         * @param reconnectOnError the value to set
-         * @return the dsl builder
-         */
-        default Sjms2ComponentBuilder reconnectOnError(boolean reconnectOnError) {
-            doSetProperty("reconnectOnError", reconnectOnError);
-            return this;
-        }
-        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -181,76 +151,6 @@ public interface Sjms2ComponentBuilderFactory {
             return this;
         }
         /**
-         * The client ID to use when creating javax.jms.Connection when using
-         * the default
-         * org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionClientId the value to set
-         * @return the dsl builder
-         */
-        default Sjms2ComponentBuilder connectionClientId(
-                java.lang.String connectionClientId) {
-            doSetProperty("connectionClientId", connectionClientId);
-            return this;
-        }
-        /**
-         * The max wait time in millis to block and wait on free connection when
-         * the pool is exhausted when using the default
-         * org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
-         * 
-         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
-         * 
-         * Default: 5000
-         * Group: advanced
-         * 
-         * @param connectionMaxWait the value to set
-         * @return the dsl builder
-         */
-        default Sjms2ComponentBuilder connectionMaxWait(long connectionMaxWait) {
-            doSetProperty("connectionMaxWait", connectionMaxWait);
-            return this;
-        }
-        /**
-         * A ConnectionResource is an interface that allows for customization
-         * and container control of the ConnectionFactory. See Plugable
-         * Connection Resource Management for further details.
-         * 
-         * The option is a:
-         * &lt;code&gt;org.apache.camel.component.sjms.jms.ConnectionResource&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionResource the value to set
-         * @return the dsl builder
-         */
-        default Sjms2ComponentBuilder connectionResource(
-                org.apache.camel.component.sjms.jms.ConnectionResource connectionResource) {
-            doSetProperty("connectionResource", connectionResource);
-            return this;
-        }
-        /**
-         * When using the default
-         * org.apache.camel.component.sjms.jms.ConnectionFactoryResource then
-         * should each javax.jms.Connection be tested before being used.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: advanced
-         * 
-         * @param connectionTestOnBorrow the value to set
-         * @return the dsl builder
-         */
-        default Sjms2ComponentBuilder connectionTestOnBorrow(
-                boolean connectionTestOnBorrow) {
-            doSetProperty("connectionTestOnBorrow", connectionTestOnBorrow);
-            return this;
-        }
-        /**
          * To use a custom DestinationCreationStrategy.
          * 
          * The option is a:
@@ -308,6 +208,60 @@ public interface Sjms2ComponentBuilderFactory {
             return this;
         }
         /**
+         * Specifies the interval between recovery attempts, i.e. when a
+         * connection is being refreshed, in milliseconds. The default is 5000
+         * ms, that is, 5 seconds.
+         * 
+         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 5000
+         * Group: advanced
+         * 
+         * @param recoveryInterval the value to set
+         * @return the dsl builder
+         */
+        default Sjms2ComponentBuilder recoveryInterval(long recoveryInterval) {
+            doSetProperty("recoveryInterval", recoveryInterval);
+            return this;
+        }
+        /**
+         * Specifies the maximum number of concurrent consumers for continue
+         * routing when timeout occurred when using request/reply over JMS.
+         * 
+         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
+         * 
+         * Default: 1
+         * Group: advanced
+         * 
+         * @param replyToOnTimeoutMaxConcurrentConsumers the value to set
+         * @return the dsl builder
+         */
+        default Sjms2ComponentBuilder replyToOnTimeoutMaxConcurrentConsumers(
+                int replyToOnTimeoutMaxConcurrentConsumers) {
+            doSetProperty("replyToOnTimeoutMaxConcurrentConsumers", replyToOnTimeoutMaxConcurrentConsumers);
+            return this;
+        }
+        /**
+         * Configures how often Camel should check for timed out Exchanges when
+         * doing request/reply over JMS. By default Camel checks once per
+         * second. But if you must react faster when a timeout occurs, then you
+         * can lower this interval, to check more frequently. The timeout is
+         * determined by the option requestTimeout.
+         * 
+         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 1000
+         * Group: advanced
+         * 
+         * @param requestTimeoutCheckerInterval the value to set
+         * @return the dsl builder
+         */
+        default Sjms2ComponentBuilder requestTimeoutCheckerInterval(
+                long requestTimeoutCheckerInterval) {
+            doSetProperty("requestTimeoutCheckerInterval", requestTimeoutCheckerInterval);
+            return this;
+        }
+        /**
          * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
          * header to and from Camel message.
          * 
@@ -326,54 +280,33 @@ public interface Sjms2ComponentBuilderFactory {
             return this;
         }
         /**
-         * The password to use when creating javax.jms.Connection when using the
-         * default
-         * org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
+         * Password to use with the ConnectionFactory. You can also configure
+         * username/password directly on the ConnectionFactory.
          * 
          * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: security
          * 
-         * @param connectionPassword the value to set
+         * @param password the value to set
          * @return the dsl builder
          */
-        default Sjms2ComponentBuilder connectionPassword(
-                java.lang.String connectionPassword) {
-            doSetProperty("connectionPassword", connectionPassword);
+        default Sjms2ComponentBuilder password(java.lang.String password) {
+            doSetProperty("password", password);
             return this;
         }
         /**
-         * The username to use when creating javax.jms.Connection when using the
-         * default
-         * org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
+         * Username to use with the ConnectionFactory. You can also configure
+         * username/password directly on the ConnectionFactory.
          * 
          * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: security
          * 
-         * @param connectionUsername the value to set
-         * @return the dsl builder
-         */
-        default Sjms2ComponentBuilder connectionUsername(
-                java.lang.String connectionUsername) {
-            doSetProperty("connectionUsername", connectionUsername);
-            return this;
-        }
-        /**
-         * To configure which kind of commit strategy to use. Camel provides two
-         * implementations out of the box, default and batch.
-         * 
-         * The option is a:
-         * &lt;code&gt;org.apache.camel.component.sjms.TransactionCommitStrategy&lt;/code&gt; type.
-         * 
-         * Group: transaction
-         * 
-         * @param transactionCommitStrategy the value to set
+         * @param username the value to set
          * @return the dsl builder
          */
-        default Sjms2ComponentBuilder transactionCommitStrategy(
-                org.apache.camel.component.sjms.TransactionCommitStrategy transactionCommitStrategy) {
-            doSetProperty("transactionCommitStrategy", transactionCommitStrategy);
+        default Sjms2ComponentBuilder username(java.lang.String username) {
+            doSetProperty("username", username);
             return this;
         }
     }
@@ -396,21 +329,17 @@ public interface Sjms2ComponentBuilderFactory {
             case "connectionCount": ((Sjms2Component) component).setConnectionCount((java.lang.Integer) value); return true;
             case "connectionFactory": ((Sjms2Component) component).setConnectionFactory((javax.jms.ConnectionFactory) value); return true;
             case "bridgeErrorHandler": ((Sjms2Component) component).setBridgeErrorHandler((boolean) value); return true;
-            case "reconnectBackOff": ((Sjms2Component) component).setReconnectBackOff((long) value); return true;
-            case "reconnectOnError": ((Sjms2Component) component).setReconnectOnError((boolean) value); return true;
             case "lazyStartProducer": ((Sjms2Component) component).setLazyStartProducer((boolean) value); return true;
             case "autowiredEnabled": ((Sjms2Component) component).setAutowiredEnabled((boolean) value); return true;
-            case "connectionClientId": ((Sjms2Component) component).setConnectionClientId((java.lang.String) value); return true;
-            case "connectionMaxWait": ((Sjms2Component) component).setConnectionMaxWait((long) value); return true;
-            case "connectionResource": ((Sjms2Component) component).setConnectionResource((org.apache.camel.component.sjms.jms.ConnectionResource) value); return true;
-            case "connectionTestOnBorrow": ((Sjms2Component) component).setConnectionTestOnBorrow((boolean) value); return true;
             case "destinationCreationStrategy": ((Sjms2Component) component).setDestinationCreationStrategy((org.apache.camel.component.sjms.jms.DestinationCreationStrategy) value); return true;
             case "jmsKeyFormatStrategy": ((Sjms2Component) component).setJmsKeyFormatStrategy((org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy) value); return true;
             case "messageCreatedStrategy": ((Sjms2Component) component).setMessageCreatedStrategy((org.apache.camel.component.sjms.jms.MessageCreatedStrategy) value); return true;
+            case "recoveryInterval": ((Sjms2Component) component).setRecoveryInterval((long) value); return true;
+            case "replyToOnTimeoutMaxConcurrentConsumers": ((Sjms2Component) component).setReplyToOnTimeoutMaxConcurrentConsumers((int) value); return true;
+            case "requestTimeoutCheckerInterval": ((Sjms2Component) component).setRequestTimeoutCheckerInterval((long) value); return true;
             case "headerFilterStrategy": ((Sjms2Component) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
-            case "connectionPassword": ((Sjms2Component) component).setConnectionPassword((java.lang.String) value); return true;
-            case "connectionUsername": ((Sjms2Component) component).setConnectionUsername((java.lang.String) value); return true;
-            case "transactionCommitStrategy": ((Sjms2Component) component).setTransactionCommitStrategy((org.apache.camel.component.sjms.TransactionCommitStrategy) value); return true;
+            case "password": ((Sjms2Component) component).setPassword((java.lang.String) value); return true;
+            case "username": ((Sjms2Component) component).setUsername((java.lang.String) value); return true;
             default: return false;
             }
         }
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java
index 730c6ba..7d64cd5 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java
@@ -150,76 +150,6 @@ public interface SjmsComponentBuilderFactory {
             return this;
         }
         /**
-         * The client ID to use when creating javax.jms.Connection when using
-         * the default
-         * org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionClientId the value to set
-         * @return the dsl builder
-         */
-        default SjmsComponentBuilder connectionClientId(
-                java.lang.String connectionClientId) {
-            doSetProperty("connectionClientId", connectionClientId);
-            return this;
-        }
-        /**
-         * The max wait time in millis to block and wait on free connection when
-         * the pool is exhausted when using the default
-         * org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
-         * 
-         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
-         * 
-         * Default: 5000
-         * Group: advanced
-         * 
-         * @param connectionMaxWait the value to set
-         * @return the dsl builder
-         */
-        default SjmsComponentBuilder connectionMaxWait(long connectionMaxWait) {
-            doSetProperty("connectionMaxWait", connectionMaxWait);
-            return this;
-        }
-        /**
-         * A ConnectionResource is an interface that allows for customization
-         * and container control of the ConnectionFactory. See Plugable
-         * Connection Resource Management for further details.
-         * 
-         * The option is a:
-         * &lt;code&gt;org.apache.camel.component.sjms.jms.ConnectionResource&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionResource the value to set
-         * @return the dsl builder
-         */
-        default SjmsComponentBuilder connectionResource(
-                org.apache.camel.component.sjms.jms.ConnectionResource connectionResource) {
-            doSetProperty("connectionResource", connectionResource);
-            return this;
-        }
-        /**
-         * When using the default
-         * org.apache.camel.component.sjms.jms.ConnectionFactoryResource then
-         * should each javax.jms.Connection be tested before being used.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: advanced
-         * 
-         * @param connectionTestOnBorrow the value to set
-         * @return the dsl builder
-         */
-        default SjmsComponentBuilder connectionTestOnBorrow(
-                boolean connectionTestOnBorrow) {
-            doSetProperty("connectionTestOnBorrow", connectionTestOnBorrow);
-            return this;
-        }
-        /**
          * To use a custom DestinationCreationStrategy.
          * 
          * The option is a:
@@ -294,6 +224,43 @@ public interface SjmsComponentBuilderFactory {
             return this;
         }
         /**
+         * Specifies the maximum number of concurrent consumers for continue
+         * routing when timeout occurred when using request/reply over JMS.
+         * 
+         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
+         * 
+         * Default: 1
+         * Group: advanced
+         * 
+         * @param replyToOnTimeoutMaxConcurrentConsumers the value to set
+         * @return the dsl builder
+         */
+        default SjmsComponentBuilder replyToOnTimeoutMaxConcurrentConsumers(
+                int replyToOnTimeoutMaxConcurrentConsumers) {
+            doSetProperty("replyToOnTimeoutMaxConcurrentConsumers", replyToOnTimeoutMaxConcurrentConsumers);
+            return this;
+        }
+        /**
+         * Configures how often Camel should check for timed out Exchanges when
+         * doing request/reply over JMS. By default Camel checks once per
+         * second. But if you must react faster when a timeout occurs, then you
+         * can lower this interval, to check more frequently. The timeout is
+         * determined by the option requestTimeout.
+         * 
+         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 1000
+         * Group: advanced
+         * 
+         * @param requestTimeoutCheckerInterval the value to set
+         * @return the dsl builder
+         */
+        default SjmsComponentBuilder requestTimeoutCheckerInterval(
+                long requestTimeoutCheckerInterval) {
+            doSetProperty("requestTimeoutCheckerInterval", requestTimeoutCheckerInterval);
+            return this;
+        }
+        /**
          * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
          * header to and from Camel message.
          * 
@@ -312,54 +279,33 @@ public interface SjmsComponentBuilderFactory {
             return this;
         }
         /**
-         * The password to use when creating javax.jms.Connection when using the
-         * default
-         * org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
+         * Password to use with the ConnectionFactory. You can also configure
+         * username/password directly on the ConnectionFactory.
          * 
          * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: security
          * 
-         * @param connectionPassword the value to set
+         * @param password the value to set
          * @return the dsl builder
          */
-        default SjmsComponentBuilder connectionPassword(
-                java.lang.String connectionPassword) {
-            doSetProperty("connectionPassword", connectionPassword);
+        default SjmsComponentBuilder password(java.lang.String password) {
+            doSetProperty("password", password);
             return this;
         }
         /**
-         * The username to use when creating javax.jms.Connection when using the
-         * default
-         * org.apache.camel.component.sjms.jms.ConnectionFactoryResource.
+         * Username to use with the ConnectionFactory. You can also configure
+         * username/password directly on the ConnectionFactory.
          * 
          * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: security
          * 
-         * @param connectionUsername the value to set
-         * @return the dsl builder
-         */
-        default SjmsComponentBuilder connectionUsername(
-                java.lang.String connectionUsername) {
-            doSetProperty("connectionUsername", connectionUsername);
-            return this;
-        }
-        /**
-         * To configure which kind of commit strategy to use. Camel provides two
-         * implementations out of the box, default and batch.
-         * 
-         * The option is a:
-         * &lt;code&gt;org.apache.camel.component.sjms.TransactionCommitStrategy&lt;/code&gt; type.
-         * 
-         * Group: transaction
-         * 
-         * @param transactionCommitStrategy the value to set
+         * @param username the value to set
          * @return the dsl builder
          */
-        default SjmsComponentBuilder transactionCommitStrategy(
-                org.apache.camel.component.sjms.TransactionCommitStrategy transactionCommitStrategy) {
-            doSetProperty("transactionCommitStrategy", transactionCommitStrategy);
+        default SjmsComponentBuilder username(java.lang.String username) {
+            doSetProperty("username", username);
             return this;
         }
     }
@@ -384,18 +330,15 @@ public interface SjmsComponentBuilderFactory {
             case "bridgeErrorHandler": ((SjmsComponent) component).setBridgeErrorHandler((boolean) value); return true;
             case "lazyStartProducer": ((SjmsComponent) component).setLazyStartProducer((boolean) value); return true;
             case "autowiredEnabled": ((SjmsComponent) component).setAutowiredEnabled((boolean) value); return true;
-            case "connectionClientId": ((SjmsComponent) component).setConnectionClientId((java.lang.String) value); return true;
-            case "connectionMaxWait": ((SjmsComponent) component).setConnectionMaxWait((long) value); return true;
-            case "connectionResource": ((SjmsComponent) component).setConnectionResource((org.apache.camel.component.sjms.jms.ConnectionResource) value); return true;
-            case "connectionTestOnBorrow": ((SjmsComponent) component).setConnectionTestOnBorrow((boolean) value); return true;
             case "destinationCreationStrategy": ((SjmsComponent) component).setDestinationCreationStrategy((org.apache.camel.component.sjms.jms.DestinationCreationStrategy) value); return true;
             case "jmsKeyFormatStrategy": ((SjmsComponent) component).setJmsKeyFormatStrategy((org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy) value); return true;
             case "messageCreatedStrategy": ((SjmsComponent) component).setMessageCreatedStrategy((org.apache.camel.component.sjms.jms.MessageCreatedStrategy) value); return true;
             case "recoveryInterval": ((SjmsComponent) component).setRecoveryInterval((long) value); return true;
+            case "replyToOnTimeoutMaxConcurrentConsumers": ((SjmsComponent) component).setReplyToOnTimeoutMaxConcurrentConsumers((int) value); return true;
+            case "requestTimeoutCheckerInterval": ((SjmsComponent) component).setRequestTimeoutCheckerInterval((long) value); return true;
             case "headerFilterStrategy": ((SjmsComponent) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
-            case "connectionPassword": ((SjmsComponent) component).setConnectionPassword((java.lang.String) value); return true;
-            case "connectionUsername": ((SjmsComponent) component).setConnectionUsername((java.lang.String) value); return true;
-            case "transactionCommitStrategy": ((SjmsComponent) component).setTransactionCommitStrategy((org.apache.camel.component.sjms.TransactionCommitStrategy) value); return true;
+            case "password": ((SjmsComponent) component).setPassword((java.lang.String) value); return true;
+            case "username": ((SjmsComponent) component).setUsername((java.lang.String) value); return true;
             default: return false;
             }
         }
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java
index 3d72324..1ea44be 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java
@@ -143,6 +143,127 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies whether to test the connection on startup. This ensures
+         * that when Camel starts that all the JMS consumers have a valid
+         * connection to the JMS broker. If a connection cannot be granted then
+         * Camel throws an exception on startup. This ensures that Camel is not
+         * started with failed connections. The JMS producers is tested as well.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param testConnectionOnStartup the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointConsumerBuilder testConnectionOnStartup(
+                boolean testConnectionOnStartup) {
+            doSetProperty("testConnectionOnStartup", testConnectionOnStartup);
+            return this;
+        }
+        /**
+         * Specifies whether to test the connection on startup. This ensures
+         * that when Camel starts that all the JMS consumers have a valid
+         * connection to the JMS broker. If a connection cannot be granted then
+         * Camel throws an exception on startup. This ensures that Camel is not
+         * started with failed connections. The JMS producers is tested as well.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param testConnectionOnStartup the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointConsumerBuilder testConnectionOnStartup(
+                String testConnectionOnStartup) {
+            doSetProperty("testConnectionOnStartup", testConnectionOnStartup);
+            return this;
+        }
+        /**
+         * Whether the JmsConsumer processes the Exchange asynchronously. If
+         * enabled then the JmsConsumer may pickup the next message from the JMS
+         * queue, while the previous message is being processed asynchronously
+         * (by the Asynchronous Routing Engine). This means that messages may be
+         * processed not 100% strictly in order. If disabled (as default) then
+         * the Exchange is fully processed before the JmsConsumer will pickup
+         * the next message from the JMS queue. Note if transacted has been
+         * enabled, then asyncConsumer=true does not run asynchronously, as
+         * transaction must be executed synchronously (Camel 3.0 may support
+         * async transactions).
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: consumer
+         * 
+         * @param asyncConsumer the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointConsumerBuilder asyncConsumer(boolean asyncConsumer) {
+            doSetProperty("asyncConsumer", asyncConsumer);
+            return this;
+        }
+        /**
+         * Whether the JmsConsumer processes the Exchange asynchronously. If
+         * enabled then the JmsConsumer may pickup the next message from the JMS
+         * queue, while the previous message is being processed asynchronously
+         * (by the Asynchronous Routing Engine). This means that messages may be
+         * processed not 100% strictly in order. If disabled (as default) then
+         * the Exchange is fully processed before the JmsConsumer will pickup
+         * the next message from the JMS queue. Note if transacted has been
+         * enabled, then asyncConsumer=true does not run asynchronously, as
+         * transaction must be executed synchronously (Camel 3.0 may support
+         * async transactions).
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: consumer
+         * 
+         * @param asyncConsumer the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointConsumerBuilder asyncConsumer(String asyncConsumer) {
+            doSetProperty("asyncConsumer", asyncConsumer);
+            return this;
+        }
+        /**
+         * Specifies whether the consumer container should auto-startup.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: true
+         * Group: consumer
+         * 
+         * @param autoStartup the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointConsumerBuilder autoStartup(boolean autoStartup) {
+            doSetProperty("autoStartup", autoStartup);
+            return this;
+        }
+        /**
+         * Specifies whether the consumer container should auto-startup.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: true
+         * Group: consumer
+         * 
+         * @param autoStartup the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointConsumerBuilder autoStartup(String autoStartup) {
+            doSetProperty("autoStartup", autoStartup);
+            return this;
+        }
+        /**
          * Allows for bridging the consumer to the Camel routing Error Handler,
          * which mean any exceptions occurred while the consumer is trying to
          * pickup incoming messages, or the likes, will now be processed as a
@@ -188,33 +309,45 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
-         * Sets the number of consumer listeners used for this endpoint.
+         * Specifies the default number of concurrent consumers when consuming
+         * from JMS (not for request/reply over JMS). See also the
+         * maxMessagesPerTask option to control dynamic scaling up/down of
+         * threads. When doing request/reply over JMS then the option
+         * replyToConcurrentConsumers is used to control number of concurrent
+         * consumers on the reply message listener.
          * 
          * The option is a: &lt;code&gt;int&lt;/code&gt; type.
          * 
          * Default: 1
          * Group: consumer
          * 
-         * @param consumerCount the value to set
+         * @param concurrentConsumers the value to set
          * @return the dsl builder
          */
-        default Sjms2EndpointConsumerBuilder consumerCount(int consumerCount) {
-            doSetProperty("consumerCount", consumerCount);
+        default Sjms2EndpointConsumerBuilder concurrentConsumers(
+                int concurrentConsumers) {
+            doSetProperty("concurrentConsumers", concurrentConsumers);
             return this;
         }
         /**
-         * Sets the number of consumer listeners used for this endpoint.
+         * Specifies the default number of concurrent consumers when consuming
+         * from JMS (not for request/reply over JMS). See also the
+         * maxMessagesPerTask option to control dynamic scaling up/down of
+         * threads. When doing request/reply over JMS then the option
+         * replyToConcurrentConsumers is used to control number of concurrent
+         * consumers on the reply message listener.
          * 
          * The option will be converted to a &lt;code&gt;int&lt;/code&gt; type.
          * 
          * Default: 1
          * Group: consumer
          * 
-         * @param consumerCount the value to set
+         * @param concurrentConsumers the value to set
          * @return the dsl builder
          */
-        default Sjms2EndpointConsumerBuilder consumerCount(String consumerCount) {
-            doSetProperty("consumerCount", consumerCount);
+        default Sjms2EndpointConsumerBuilder concurrentConsumers(
+                String concurrentConsumers) {
+            doSetProperty("concurrentConsumers", concurrentConsumers);
             return this;
         }
         /**
@@ -264,71 +397,6 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
-         * Backoff in millis on consumer pool reconnection attempts.
-         * 
-         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
-         * 
-         * Default: 5000
-         * Group: consumer
-         * 
-         * @param reconnectBackOff the value to set
-         * @return the dsl builder
-         */
-        default Sjms2EndpointConsumerBuilder reconnectBackOff(
-                long reconnectBackOff) {
-            doSetProperty("reconnectBackOff", reconnectBackOff);
-            return this;
-        }
-        /**
-         * Backoff in millis on consumer pool reconnection attempts.
-         * 
-         * The option will be converted to a &lt;code&gt;long&lt;/code&gt; type.
-         * 
-         * Default: 5000
-         * Group: consumer
-         * 
-         * @param reconnectBackOff the value to set
-         * @return the dsl builder
-         */
-        default Sjms2EndpointConsumerBuilder reconnectBackOff(
-                String reconnectBackOff) {
-            doSetProperty("reconnectBackOff", reconnectBackOff);
-            return this;
-        }
-        /**
-         * Try to apply reconnection logic on consumer pool.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: consumer
-         * 
-         * @param reconnectOnError the value to set
-         * @return the dsl builder
-         */
-        default Sjms2EndpointConsumerBuilder reconnectOnError(
-                boolean reconnectOnError) {
-            doSetProperty("reconnectOnError", reconnectOnError);
-            return this;
-        }
-        /**
-         * Try to apply reconnection logic on consumer pool.
-         * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
-         * 
-         * Default: true
-         * Group: consumer
-         * 
-         * @param reconnectOnError the value to set
-         * @return the dsl builder
-         */
-        default Sjms2EndpointConsumerBuilder reconnectOnError(
-                String reconnectOnError) {
-            doSetProperty("reconnectOnError", reconnectOnError);
-            return this;
-        }
-        /**
          * Specifies whether to use persistent delivery by default for replies.
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
@@ -408,39 +476,6 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
-         * Sets whether synchronous processing should be strictly used or Camel
-         * is allowed to use asynchronous processing (if supported).
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: consumer
-         * 
-         * @param synchronous the value to set
-         * @return the dsl builder
-         */
-        default Sjms2EndpointConsumerBuilder synchronous(boolean synchronous) {
-            doSetProperty("synchronous", synchronous);
-            return this;
-        }
-        /**
-         * Sets whether synchronous processing should be strictly used or Camel
-         * is allowed to use asynchronous processing (if supported).
-         * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
-         * 
-         * Default: true
-         * Group: consumer
-         * 
-         * @param synchronous the value to set
-         * @return the dsl builder
-         */
-        default Sjms2EndpointConsumerBuilder synchronous(String synchronous) {
-            doSetProperty("synchronous", synchronous);
-            return this;
-        }
-        /**
          * Allows to configure the default errorHandler logging level for
          * logging uncaught exceptions.
          * 
@@ -542,48 +577,78 @@ public interface Sjms2EndpointBuilderFactory {
             doSetProperty("transacted", transacted);
             return this;
         }
+    }
+
+    /**
+     * Advanced builder for endpoint consumers for the Simple JMS2 component.
+     */
+    public interface AdvancedSjms2EndpointConsumerBuilder
+            extends
+                EndpointConsumerBuilder {
+        default Sjms2EndpointConsumerBuilder basic() {
+            return (Sjms2EndpointConsumerBuilder) this;
+        }
         /**
-         * Sets the commit strategy.
+         * Enables eager loading of JMS properties and payload as soon as a
+         * message is loaded which generally is inefficient as the JMS
+         * properties may not be required but sometimes can catch early any
+         * issues with the underlying JMS provider and the use of JMS
+         * properties. See also the option eagerPoisonBody.
          * 
-         * The option is a:
-         * &lt;code&gt;org.apache.camel.component.sjms.TransactionCommitStrategy&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Group: transaction
+         * Default: false
+         * Group: consumer (advanced)
          * 
-         * @param transactionCommitStrategy the value to set
+         * @param eagerLoadingOfProperties the value to set
          * @return the dsl builder
          */
-        default Sjms2EndpointConsumerBuilder transactionCommitStrategy(
-                Object transactionCommitStrategy) {
-            doSetProperty("transactionCommitStrategy", transactionCommitStrategy);
+        default AdvancedSjms2EndpointConsumerBuilder eagerLoadingOfProperties(
+                boolean eagerLoadingOfProperties) {
+            doSetProperty("eagerLoadingOfProperties", eagerLoadingOfProperties);
             return this;
         }
         /**
-         * Sets the commit strategy.
+         * Enables eager loading of JMS properties and payload as soon as a
+         * message is loaded which generally is inefficient as the JMS
+         * properties may not be required but sometimes can catch early any
+         * issues with the underlying JMS provider and the use of JMS
+         * properties. See also the option eagerPoisonBody.
          * 
-         * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.sjms.TransactionCommitStrategy&lt;/code&gt; type.
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
          * 
-         * Group: transaction
+         * Default: false
+         * Group: consumer (advanced)
          * 
-         * @param transactionCommitStrategy the value to set
+         * @param eagerLoadingOfProperties the value to set
          * @return the dsl builder
          */
-        default Sjms2EndpointConsumerBuilder transactionCommitStrategy(
-                String transactionCommitStrategy) {
-            doSetProperty("transactionCommitStrategy", transactionCommitStrategy);
+        default AdvancedSjms2EndpointConsumerBuilder eagerLoadingOfProperties(
+                String eagerLoadingOfProperties) {
+            doSetProperty("eagerLoadingOfProperties", eagerLoadingOfProperties);
             return this;
         }
-    }
-
-    /**
-     * Advanced builder for endpoint consumers for the Simple JMS2 component.
-     */
-    public interface AdvancedSjms2EndpointConsumerBuilder
-            extends
-                EndpointConsumerBuilder {
-        default Sjms2EndpointConsumerBuilder basic() {
-            return (Sjms2EndpointConsumerBuilder) this;
+        /**
+         * If eagerLoadingOfProperties is enabled and the JMS message payload
+         * (JMS body or JMS properties) is poison (cannot be read/mapped), then
+         * set this text as the message body instead so the message can be
+         * processed (the cause of the poison are already stored as exception on
+         * the Exchange). This can be turned off by setting
+         * eagerPoisonBody=false. See also the option eagerLoadingOfProperties.
+         * 
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
+         * 
+         * Default: Poison JMS message due to ${exception.message}
+         * Group: consumer (advanced)
+         * 
+         * @param eagerPoisonBody the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjms2EndpointConsumerBuilder eagerPoisonBody(
+                String eagerPoisonBody) {
+            doSetProperty("eagerPoisonBody", eagerPoisonBody);
+            return this;
         }
         /**
          * To let the consumer use a custom ExceptionHandler. Notice if the
@@ -671,6 +736,45 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
+         * 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.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: consumer (advanced)
+         * 
+         * @param replyToSameDestinationAllowed the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjms2EndpointConsumerBuilder replyToSameDestinationAllowed(
+                boolean replyToSameDestinationAllowed) {
+            doSetProperty("replyToSameDestinationAllowed", replyToSameDestinationAllowed);
+            return this;
+        }
+        /**
+         * 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.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: consumer (advanced)
+         * 
+         * @param replyToSameDestinationAllowed the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjms2EndpointConsumerBuilder replyToSameDestinationAllowed(
+                String replyToSameDestinationAllowed) {
+            doSetProperty("replyToSameDestinationAllowed", replyToSameDestinationAllowed);
+            return this;
+        }
+        /**
          * Whether to startup the consumer message listener asynchronously, when
          * starting a route. For example if a JmsConsumer cannot get a
          * connection to a remote JMS broker, then it may block while retrying
@@ -824,40 +928,6 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
-         * Initializes the connectionResource for the endpoint, which takes
-         * precedence over the component's connectionResource, if any.
-         * 
-         * The option is a:
-         * &lt;code&gt;org.apache.camel.component.sjms.jms.ConnectionResource&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionResource the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointConsumerBuilder connectionResource(
-                Object connectionResource) {
-            doSetProperty("connectionResource", connectionResource);
-            return this;
-        }
-        /**
-         * Initializes the connectionResource for the endpoint, which takes
-         * precedence over the component's connectionResource, if any.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.sjms.jms.ConnectionResource&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionResource the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSjms2EndpointConsumerBuilder connectionResource(
-                String connectionResource) {
-            doSetProperty("connectionResource", connectionResource);
-            return this;
-        }
-        /**
          * To use a custom DestinationCreationStrategy.
          * 
          * The option is a:
@@ -1120,6 +1190,136 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies the interval between recovery attempts, i.e. when a
+         * connection is being refreshed, in milliseconds. The default is 5000
+         * ms, that is, 5 seconds.
+         * 
+         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 5000
+         * Group: advanced
+         * 
+         * @param recoveryInterval the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjms2EndpointConsumerBuilder recoveryInterval(
+                long recoveryInterval) {
+            doSetProperty("recoveryInterval", recoveryInterval);
+            return this;
+        }
+        /**
+         * Specifies the interval between recovery attempts, i.e. when a
+         * connection is being refreshed, in milliseconds. The default is 5000
+         * ms, that is, 5 seconds.
+         * 
+         * The option will be converted to a &lt;code&gt;long&lt;/code&gt; type.
+         * 
+         * Default: 5000
+         * Group: advanced
+         * 
+         * @param recoveryInterval the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjms2EndpointConsumerBuilder recoveryInterval(
+                String recoveryInterval) {
+            doSetProperty("recoveryInterval", recoveryInterval);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param synchronous the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjms2EndpointConsumerBuilder synchronous(
+                boolean synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param synchronous the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjms2EndpointConsumerBuilder synchronous(
+                String synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
+        /**
+         * If enabled and you are using Request Reply messaging (InOut) and an
+         * Exchange failed on the consumer side, then the caused Exception will
+         * be send back in response as a javax.jms.ObjectMessage. If the client
+         * is Camel, the returned Exception is rethrown. This allows you to use
+         * Camel JMS as a bridge in your routing - for example, using persistent
+         * queues to enable robust routing. Notice that if you also have
+         * transferExchange enabled, this option takes precedence. The caught
+         * exception is required to be serializable. The original Exception on
+         * the consumer side can be wrapped in an outer exception such as
+         * org.apache.camel.RuntimeCamelException when returned to the producer.
+         * Use this with caution as the data is using Java Object serialization
+         * and requires the received to be able to deserialize the data at Class
+         * level, which forces a strong coupling between the producers and
+         * consumer!.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param transferException the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjms2EndpointConsumerBuilder transferException(
+                boolean transferException) {
+            doSetProperty("transferException", transferException);
+            return this;
+        }
+        /**
+         * If enabled and you are using Request Reply messaging (InOut) and an
+         * Exchange failed on the consumer side, then the caused Exception will
+         * be send back in response as a javax.jms.ObjectMessage. If the client
+         * is Camel, the returned Exception is rethrown. This allows you to use
+         * Camel JMS as a bridge in your routing - for example, using persistent
+         * queues to enable robust routing. Notice that if you also have
+         * transferExchange enabled, this option takes precedence. The caught
+         * exception is required to be serializable. The original Exception on
+         * the consumer side can be wrapped in an outer exception such as
+         * org.apache.camel.RuntimeCamelException when returned to the producer.
+         * Use this with caution as the data is using Java Object serialization
+         * and requires the received to be able to deserialize the data at Class
+         * level, which forces a strong coupling between the producers and
+         * consumer!.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: advanced
+         * 
+         * @param transferException the value to set
+         * @return the dsl builder
+         */
+        default AdvancedSjms2EndpointConsumerBuilder transferException(
+                String transferException) {
+            doSetProperty("transferException", transferException);
+            return this;
+        }
+        /**
          * Specifies whether to share JMS session with other SJMS endpoints.
          * Turn this off if your route is accessing to multiple JMS providers.
          * If you need transaction against multiple JMS providers, use jms
@@ -1268,6 +1468,47 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies whether to test the connection on startup. This ensures
+         * that when Camel starts that all the JMS consumers have a valid
+         * connection to the JMS broker. If a connection cannot be granted then
+         * Camel throws an exception on startup. This ensures that Camel is not
+         * started with failed connections. The JMS producers is tested as well.
+         * 
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param testConnectionOnStartup the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder testConnectionOnStartup(
+                boolean testConnectionOnStartup) {
+            doSetProperty("testConnectionOnStartup", testConnectionOnStartup);
+            return this;
+        }
+        /**
+         * Specifies whether to test the connection on startup. This ensures
+         * that when Camel starts that all the JMS consumers have a valid
+         * connection to the JMS broker. If a connection cannot be granted then
+         * Camel throws an exception on startup. This ensures that Camel is not
+         * started with failed connections. The JMS producers is tested as well.
+         * 
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
+         * 
+         * Default: false
+         * Group: common
+         * 
+         * @param testConnectionOnStartup the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder testConnectionOnStartup(
+                String testConnectionOnStartup) {
+            doSetProperty("testConnectionOnStartup", testConnectionOnStartup);
+            return this;
+        }
+        /**
          * Specifies the delivery mode to be used. Possible values are those
          * defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT
          * = 2.
@@ -1511,6 +1752,42 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
+         * Specifies the default number of concurrent consumers when doing
+         * request/reply over JMS. See also the maxMessagesPerTask option to
+         * control dynamic scaling up/down of threads.
+         * 
+         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
+         * 
+         * Default: 1
+         * Group: producer
+         * 
+         * @param replyToConcurrentConsumers the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder replyToConcurrentConsumers(
+                int replyToConcurrentConsumers) {
+            doSetProperty("replyToConcurrentConsumers", replyToConcurrentConsumers);
+            return this;
+        }
+        /**
+         * Specifies the default number of concurrent consumers when doing
+         * request/reply over JMS. See also the maxMessagesPerTask option to
+         * control dynamic scaling up/down of threads.
+         * 
+         * The option will be converted to a &lt;code&gt;int&lt;/code&gt; type.
+         * 
+         * Default: 1
+         * Group: producer
+         * 
+         * @param replyToConcurrentConsumers the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder replyToConcurrentConsumers(
+                String replyToConcurrentConsumers) {
+            doSetProperty("replyToConcurrentConsumers", replyToConcurrentConsumers);
+            return this;
+        }
+        /**
          * Provides an explicit ReplyTo destination in the JMS message, which
          * overrides the setting of replyTo. It is useful if you want to forward
          * the message to a remote Queue and receive the reply message from the
@@ -1529,6 +1806,54 @@ public interface Sjms2EndpointBuilderFactory {
             return this;
         }
         /**
+         * 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.
+         * 
+         * The option is a:
+         * &lt;code&gt;org.apache.camel.component.sjms.ReplyToType&lt;/code&gt;
+         * type.
+         * 
+         * Group: producer
+         * 
+         * @param replyToType the value to set
+         * @return the dsl builder
+         */
+        default Sjms2EndpointProducerBuilder replyToType(ReplyToType replyToType) {
+            doSetProperty("replyToType", replyToType);
+            return this;
+        }
... 2156 lines suppressed ...