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
