This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch jakarta/rewritten
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 65c4c9a1dec47c2c0ce0f8a5c5d6c30a1da71372
Merge: f17e33616f6 d41e5972072
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jan 6 12:07:06 2023 +0100
Merge jakarta/jms
components/camel-amqp/pom.xml | 15 +-
.../apache/camel/component/amqp/AMQPRouteTest.java | 24 +---
.../component/amqp/AMQPRouteTraceFrameTest.java | 26 +---
.../camel/component/amqp/AMQPTestSupport.java} | 22 +--
.../component/amqp/AMQPToDSendDynamicTest.java | 23 +--
.../apache/camel/component/amqp/AMQPToDTest.java | 23 +--
.../amqp/artemis/AMQPEmbeddedBrokerTest.java | 44 +-----
components/camel-jms/pom.xml | 8 ++
.../camel/component/jms/AbstractJMSTest.java | 10 +-
.../component/jms/AbstractPersistentJMSTest.java | 8 +-
.../jms/ActiveMQOriginalDestinationTest.java | 29 ++--
.../jms/ConsumerTemplateJmsSelectorTest.java | 2 +-
.../jms/JmsAllowAdditionalHeadersTest.java | 4 +-
.../component/jms/JmsAsyncStartListenerTest.java | 2 +-
.../jms/JmsAsyncStartStopListenerTest.java | 8 +-
.../component/jms/JmsAsyncStopListenerTest.java | 4 +-
.../jms/JmsCustomHeaderFilterStrategyTest.java | 4 +-
.../jms/JmsDefaultTaskExecutorTypeTest.java | 10 +-
.../component/jms/JmsDestinationResolverTest.java | 4 +-
.../jms/JmsErrorHandlerLogStackTraceTest.java | 4 +-
.../component/jms/JmsHeaderFilteringTest.java | 4 +-
...ToDisabledButJMSReplyToHeaderPreservedTest.java | 3 +-
.../jms/JmsInOnlyWithReplyToHeaderTest.java | 2 +-
.../jms/JmsInOnlyWithReplyToHeaderTopicTest.java | 2 +-
.../component/jms/JmsInOutBeanReturnNullTest.java | 7 +-
.../jms/JmsInOutTransferExchangeTest.java | 2 +-
.../jms/JmsIncludeAllJMSXPropertiesTest.java | 4 +-
.../component/jms/JmsLoadBalanceFailoverTest.java | 10 +-
...ailoverWithForceSendOriginalJmsMessageTest.java | 6 +-
.../JmsMessageCreatedStrategyComponentTest.java | 4 +-
.../jms/JmsMessageIDNotOverridenAMQTest.java | 4 +-
.../jms/JmsNotIncludeAllJMSXPropertiesTest.java | 4 +-
.../jms/JmsProducerWithJMSHeaderTest.java | 8 +-
...sRequestReplyExclusiveReplyToComponentTest.java | 4 +-
.../JmsRequestReplyFixedReplyToInEndpointTest.java | 8 +-
.../jms/JmsRequestReplyManualReplyTest.java | 2 +-
.../JmsRequestReplyManualWithJMSReplyToTest.java | 7 +-
.../jms/JmsRequestReplyReplyToOverrideTest.java | 6 +-
.../jms/JmsRouteDeliveryModePreserveQoSTest.java | 3 +
.../jms/JmsRouteTimeoutCheckerIntervalTest.java | 4 +-
.../JmsRouteWithCustomKeyFormatStrategyTest.java | 25 ++--
...sRouteWithPassThroughKeyFormatStrategyTest.java | 3 +
.../camel/component/jms/JmsSelectorInTest.java | 15 +-
.../jms/JmsSimpleRequestCustomReplyToTest.java | 4 +-
.../jms/JmsSimpleRequestLateReplyTest.java | 4 +-
.../JmsStreamMessageTypeNoStreamCachingTest.java | 4 +-
.../component/jms/JmsStreamMessageTypeTest.java | 4 +-
.../jms/JmsThrottlingInflightRoutePolicyTest.java | 2 +-
.../component/jms/JmsTransferExchangeTest.java | 6 +-
.../component/jms/ManagedJmsEndpointTest.java | 6 +-
...RequestReplyCorrelatedWithCustomHeaderTest.java | 4 +-
.../component/jms/TwoConsumerOnSameQueueTest.java | 3 +
.../ActiveMQConsumeWildcardQueuesTest.java | 19 ++-
.../jms/issues/ActiveMQPropagateHeadersTest.java | 2 +-
.../ActiveMQPropagateSerializableHeadersTest.java | 2 +-
.../jms/issues/JmsAnotherCustomJMSReplyToTest.java | 8 +-
.../issues/JmsConcurrentConsumerInOnlyTest.java | 6 +-
.../jms/issues/JmsCustomJMSReplyToIssueTest.java | 10 +-
.../JmsInOutExclusiveTopicRecipientListTest.java | 4 +-
.../jms/issues/JmsInOutExclusiveTopicTest.java | 2 +
.../JmsPassThroughtJmsKeyFormatStrategyTest.java | 4 +-
...KeyFormatStrategyUsingJmsConfigurationTest.java | 4 +-
...etterChannelHandlerRollbackOnExceptionTest.java | 10 +-
...erChannelNotHandlerRollbackOnExceptionTest.java | 2 +-
...ansactedOnExceptionRollbackOnExceptionTest.java | 13 +-
.../component/jms/issues/TempReplyToIssueTest.java | 2 +-
components/camel-sjms/pom.xml | 13 +-
.../camel/component/sjms/CamelJmsTestHelper.java | 29 ++--
.../component/sjms/SimpleJmsComponentTest.java | 2 +-
.../component/sjms/SjmsComponentRestartTest.java | 9 +-
.../sjms/SjmsEndpointConnectionSettingsTest.java | 2 +-
.../sjms/SjmsEndpointNameOverrideTest.java | 2 +-
.../camel/component/sjms/SjmsEndpointTest.java | 2 +-
.../sjms/consumer/AsyncConsumerFalseTest.java | 10 +-
.../sjms/consumer/AsyncConsumerInOutTest.java | 10 +-
.../consumer/InOnlyTopicDurableConsumerTest.java | 6 +-
.../sjms/manual/ManualFromQueueManualTest.java | 2 +-
.../sjms/producer/AsyncQueueProducerTest.java | 10 +-
.../sjms/producer/AsyncTopicProducerTest.java | 10 +-
.../sjms/producer/QueueProducerQoSTest.java | 54 +++----
.../component/sjms/support/JmsTestSupport.java | 33 +----
.../component/sjms/support/MockConnection.java | 63 ---------
.../sjms/support/MockConnectionFactory.java | 61 --------
.../sjms/support/MockMessageConsumer.java | 50 -------
.../camel/component/sjms/support/MockSession.java | 75 ----------
.../sjms/support/SjmsConnectionTestSupport.java | 20 +--
.../sjms/tx/TransactedAsyncExceptionTest.java | 19 ++-
.../sjms/tx/TransactedConcurrentConsumersTest.java | 4 +-
.../sjms/tx/TransactedConsumerSupport.java | 13 +-
.../tx/TransactedConsumersMultipleRouteTest.java | 6 +-
.../sjms/tx/TransactedOnCompletionTest.java | 10 +-
.../sjms/tx/TransactedQueueConsumerTest.java | 4 +-
.../sjms/tx/TransactedQueueInOutProducerTest.java | 10 +-
.../sjms/tx/TransactedQueueProducerTest.java | 10 +-
.../sjms/tx/TransactedTopicConsumerTest.java | 4 +-
test-infra/camel-test-infra-activemq/pom.xml | 7 +
.../activemq/common/ConnectionFactoryHelper.java | 2 +-
.../services/AbstractActiveMQEmbeddedService.java | 1 +
test-infra/camel-test-infra-artemis/pom.xml | 28 +++-
.../infra/artemis/common/ArtemisProperties.java | 17 +--
.../artemis/common/ConnectionFactoryHelper.java | 67 +++++++++
.../services/AbstractArtemisEmbeddedService.java | 124 +++++++++++++++++
.../infra/artemis/services/ArtemisAMQPService.java | 71 ++++++++++
.../infra/artemis/services/ArtemisContainer.java | 1 -
.../services/ArtemisEmbeddedServiceBuilder.java | 57 ++++++++
.../services/ArtemisPersistentVMService.java | 61 ++++++++
.../infra/artemis/services/ArtemisService.java | 69 +++++++++
.../artemis/services/ArtemisServiceFactory.java | 155 +++++++++++++++++++++
.../infra/artemis/services/ArtemisTCPService.java | 62 +++++++++
.../infra/artemis/services/ArtemisVMService.java | 58 ++++++++
.../camel-test-infra-messaging-common/pom.xml | 9 +-
.../services/ConnectionFactoryAware.java | 2 +-
112 files changed, 1140 insertions(+), 730 deletions(-)
