You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/02/04 10:24:30 UTC
[camel] branch master updated (4328507 -> 74083ab)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4328507 Fix unit tests
new 1d613bf CAMEL-13149 - Move ActiveMQ Camel Component to Camel Repository as Camel-ActiveMQ
new 0824e20 CAMEL-13149 - Added Camel-ActiveMQ to kit
new ed5ed36 CAMEL-13149 - Regen
new 3ce18b5 CAMEL-13149 - Make Camel-JMS use Camel-Activemq instead of ActiveMQ-Camel from ActiveMQ
new 14170e5 CAMEL-13149 - Make Camel-Itest use Camel-Activemq instead of ActiveMQ-Camel from ActiveMQ
new 42415d6 CAMEL-13149: camel-jms should not use activemq-camel during testing but use plain jms and jms client apis
new 46e4e7b CAMEL-13149 - Regen
new 74083ab CAMEL-13149 - Added docs
The 35216 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:
apache-camel/pom.xml | 10 +
apache-camel/src/main/descriptors/common-bin.xml | 2 +
bom/camel-bom/pom.xml | 10 +
components/camel-activemq/pom.xml | 254 ++++
.../src/main/docs/activemq-component.adoc | 411 ++++++
.../component/activemq/ActiveMQComponent.java | 257 ++++
.../component/activemq/ActiveMQConfiguration.java | 203 +++
.../camel/component/activemq/ActiveMQEndpoint.java | 33 +
.../camel/component/activemq/CamelConnection.java | 45 +
.../component/activemq/CamelConnectionFactory.java | 55 +
.../camel/component/activemq/CamelDestination.java | 162 +++
.../component/activemq/CamelEndpointLoader.java | 179 +++
.../component/activemq/CamelMessageConsumer.java | 173 +++
.../component/activemq/CamelMessageProducer.java | 106 ++
.../camel/component/activemq/CamelQueue.java | 48 +
.../component/activemq/CamelQueueReceiver.java | 50 +
.../camel/component/activemq/CamelQueueSender.java | 91 ++
.../component/activemq/CamelShutdownHook.java | 73 ++
.../camel/component/activemq/CamelTopic.java | 50 +
.../component/activemq/CamelTopicPublisher.java | 146 +++
.../component/activemq/CamelTopicSubscriber.java | 65 +
.../OriginalDestinationPropagateStrategy.java | 56 +
.../activemq/converter/ActiveMQConverter.java | 42 +
.../converter/ActiveMQMessageConverter.java | 102 ++
.../component/activemq/converter/package.html | 28 +
.../apache/camel/component/activemq/package.html | 29 +
.../services/org/apache/camel/TypeConverter | 19 +
.../services/org/apache/camel/component/activemq | 18 +
.../services/org/apache/camel/component/broker | 18 +
.../src/test/data/message1.xml} | 25 +-
.../camel/component/activemq/AMQ2240Test.java | 96 ++
.../camel/component/activemq/AMQ2611Test.java | 88 ++
...tiveMQComponentFactoryUserNamePasswordTest.java | 49 +
.../ActiveMQComponentUserNamePasswordTest.java | 49 +
.../component/activemq/ActiveMQConfigureTest.java | 99 ++
.../activemq/ActiveMQJmsHeaderRouteForceTest.java | 49 +
.../activemq/ActiveMQJmsHeaderRouteTest.java | 99 ++
.../activemq/ActiveMQOriginalDestinationTest.java | 76 ++
.../ActiveMQReplyToHeaderUsingConverterTest.java | 113 ++
.../component/activemq/ActiveMQRouteTest.java | 87 ++
.../activemq/AdvisoryConsumerExample.java | 70 +
.../activemq/AutoExposeQueuesInCamelTest.java | 112 ++
.../activemq/BrokerPreShutdownHookTest.java | 81 ++
.../CamelDestinationExclusiveConsumerTest.java | 47 +
.../activemq/CamelEmbeddedBrokerTestSupport.java | 148 +++
.../activemq/CamelJmsRequestReplyNobTest.java | 111 ++
.../camel/component/activemq/CamelJmsTest.java | 105 ++
.../activemq/CamelVMTransportRoutingTest.java | 158 +++
.../activemq/ComplexRequestReplyTest.java | 196 +++
.../apache/camel/component/activemq/DlqTest.java | 98 ++
...nvokeRequestReplyUsingJmsReplyToHeaderTest.java | 118 ++
.../apache/camel/component/activemq/JmsBridge.java | 140 ++
.../activemq/JmsConsumeSendTransacted.java | 100 ++
.../component/activemq/JmsJdbcXARollbackTest.java | 185 +++
.../camel/component/activemq/JmsJdbcXATest.java | 209 +++
.../activemq/JmsSimpleRequestReplyTest.java | 82 ++
.../component/activemq/ObjectMessageTest.java | 87 ++
.../camel/component/activemq/ObjectPayload.java | 25 +
.../component/activemq/SetGroupIdProcessor.java | 36 +
.../camel/component/activemq/SetHeaderTest.java | 65 +
.../component/activemq/TransactedConsumeTest.java | 140 ++
.../converter/InvokeJmsMessageListenerTest.java | 61 +
.../converter/InvokeMessageListenerTest.java | 73 ++
.../src/test/resources/log4j.properties | 35 +
.../ActiveMQComponentFactoryUserNamePassword.xml} | 48 +-
.../ActiveMQComponentUserNamePassword.xml} | 48 +-
.../activemq/BrowseQueuesInUFace-context.xml} | 24 +-
...elDestinationExclusiveConsumerTest-context.xml} | 40 +-
.../component/activemq/SetHeaderTest-context.xml} | 45 +-
.../org/apache/camel/component/activemq/dlq.xml | 71 ++
.../component/activemq/jms-object-message.xml | 116 ++
.../apache/camel/component/activemq/jmsBridge.xml | 85 ++
.../activemq/jmsConsumeSendTransacted.xml | 57 +
.../apache/camel/component/activemq/jmsXajdbc.xml | 111 ++
.../camel/component/activemq/jmsXajdbcRollback.xml | 116 ++
.../camel/component/activemq/requestReply.xml | 76 ++
.../apache/camel/component/activemq/spring.xml} | 33 +-
.../camel/component/activemq/transactedconsume.xml | 141 ++
.../jms/JmsThrottlingInflightRoutePolicyTest.java | 1 +
.../component/jms/issues/AdviceWithIssueTest.java | 10 +
.../jms/SpringJmsRoutingSlipInOutTest.xml | 6 +-
.../camel/component/jms/SpringJmsSelectorTest.xml | 2 +-
.../component/jms/SpringJmsXPathHeaderTest.xml | 2 +-
.../component/jms/activemq/twoActiveMQBrokers.xml | 4 +-
.../org/apache/camel/component/jms/bind/spring.xml | 2 +-
.../issues/JmsInOutWithSpringRestartIssueTest.xml | 6 +-
.../jms/issues/JmsResequencerTest-context.xml | 2 +-
.../jms/issues/JmsTXForceShutdownIssueTest.xml | 2 +-
...tionErrorHandlerRedeliveryDelayTest-context.xml | 2 +-
.../component/jms/issues/camelBrokerClient.xml | 6 +-
.../component/jms/jmsHeaderFilteringWithSpring.xml | 2 +-
.../camel/component/jms/jmsRouteUsingSpring.xml | 2 +-
.../jms/jmsRouteUsingSpringAndJmsName.xml | 2 +-
.../jms/jmsRouteUsingSpringJMSTemplate.xml | 2 +-
.../jms/remoting/RemotingTest-context.xml | 2 +-
.../apache/camel/component/jms/remoting/spring.xml | 2 +-
.../tuning/PerformanceRoutePojoTest-context.xml | 2 +-
.../component/jms/tx/AbstractTransactionTest.xml | 4 +-
.../jms/tx/ActiveMQWithoutTransactionManager.xml | 2 +-
.../jms/tx/JMSTransactionErrorHandlerTest.xml | 2 +-
.../JMSTransactionIsTransactedRedeliveredTest.xml | 2 +-
.../jms/tx/JMSTransactionRollbackTest.xml | 2 +-
.../tx/JMSTransactionThrottlingRoutePolicyTest.xml | 4 +-
.../jms/tx/JMSTransactionalClientTest.xml | 2 +-
.../tx/JMSTransactionalClientWithRollbackTest.xml | 2 +-
.../component/jms/tx/JMXTXUseOriginalBodyTest.xml | 2 +-
...JMXTXUseOriginalBodyWithDLCErrorHandlerTest.xml | 2 +-
.../JMXTXUseOriginalBodyWithTXErrorHandlerTest.xml | 2 +-
.../jms/tx/JmsToJmsTransactedSecurityTest.xml | 2 +-
.../component/jms/tx/JmsToJmsTransactedTest.xml | 8 +-
.../component/jms/tx/JmsTransacted-context.xml | 2 +-
.../component/jms/tx/RouteIdTransactedTest.xml | 2 +-
.../jms/tx/TransactedAsyncUsingThreadsTest.xml | 2 +-
...nsactionErrorHandlerBuilderAsSpringBeanTest.xml | 2 +-
...sactionErrorHandlerCustomerSpringParserTest.xml | 2 +-
.../tx/TransactionInterceptSendToEndpointTest.xml | 2 +-
.../jms/tx/TransactionMinimalConfigurationTest.xml | 2 +-
components/pom.xml | 1 +
components/readme.adoc | 5 +-
parent/pom.xml | 10 +
.../camel-activemq-starter/pom.xml | 53 +
.../ActiveMQComponentAutoConfiguration.java | 128 ++
.../springboot/ActiveMQComponentConfiguration.java | 1345 ++++++++++++++++++++
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 19 +
.../src/main/resources/META-INF/spring.provides | 17 +
platforms/spring-boot/components-starter/pom.xml | 1 +
.../camel-spring-boot-dependencies/pom.xml | 10 +
tests/camel-itest/pom.xml | 4 +-
.../greeter/CamelGreeterConsumerTest-context.xml | 2 +-
.../itest/greeter/CamelGreeterTest-context.xml | 2 +-
.../itest/greeter/CxfToJmsInOutTest-context.xml | 2 +-
.../itest/greeter/JmsToCxfInOutTest-context.xml | 2 +-
.../JettyJmsShutdownInProgressTest-context.xml | 2 +-
.../itest/jetty/JettyJmsShutdownTest-context.xml | 2 +-
.../camel/itest/jetty/JettyJmsTest-context.xml | 2 +-
.../itest/jetty/JettyJmsTwowayTest-context.xml | 2 +-
.../jetty/JettyMulticastJmsFileTest-context.xml | 2 +-
.../itest/jms/AdviceWithTransactionIssueTest.xml | 2 +-
.../camel/itest/jms/FileToJmsTest-context.xml | 2 +-
.../JMSTransactionIsTransactedRedeliveredTest.xml | 2 +-
.../itest/jms/JmsConsumerShutdownTest-context.xml | 4 +-
.../itest/jms/JmsPollingConsumerTest-context.xml | 6 +-
.../camel/itest/jms/SpringJmsValidatorTest.xml | 2 +-
.../FromJmsToJdbcIdempotentConsumerToJmsTest.xml | 4 +-
.../FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml | 4 +-
.../camel/itest/tx/Jms2RequiresNewTest-context.xml | 2 +-
.../camel/itest/tx/JmsToHttpTXTest-context.xml | 2 +-
...ansactionErrorHandlerConfiguredTest-context.xml | 2 +-
.../tx/JmsToHttpTXWithOnExceptionTest-context.xml | 2 +-
.../tx/JmsToHttpTXWithRollbackTest-context.xml | 2 +-
152 files changed, 8616 insertions(+), 198 deletions(-)
create mode 100644 components/camel-activemq/pom.xml
create mode 100644 components/camel-activemq/src/main/docs/activemq-component.adoc
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQEndpoint.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelConnection.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelConnectionFactory.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelDestination.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelEndpointLoader.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelMessageConsumer.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelMessageProducer.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueue.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueueReceiver.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueueSender.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelShutdownHook.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopic.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopicPublisher.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopicSubscriber.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/OriginalDestinationPropagateStrategy.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/converter/ActiveMQConverter.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverter.java
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/converter/package.html
create mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/package.html
create mode 100644 components/camel-activemq/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
create mode 100644 components/camel-activemq/src/main/resources/META-INF/services/org/apache/camel/component/activemq
create mode 100644 components/camel-activemq/src/main/resources/META-INF/services/org/apache/camel/component/broker
copy components/{camel-jms/src/test/resources/org/apache/camel/component/jms/issues/camelBrokerClient.xml => camel-activemq/src/test/data/message1.xml} (51%)
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2240Test.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2611Test.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentFactoryUserNamePasswordTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentUserNamePasswordTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQConfigureTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteForceTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQRouteTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExample.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AutoExposeQueuesInCamelTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/BrokerPreShutdownHookTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelDestinationExclusiveConsumerTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelEmbeddedBrokerTestSupport.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelJmsRequestReplyNobTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelJmsTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ComplexRequestReplyTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectPayload.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetGroupIdProcessor.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetHeaderTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
create mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
create mode 100644 components/camel-activemq/src/test/resources/log4j.properties
copy components/{camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringJMSTemplate.xml => camel-activemq/src/test/resources/org/apache/camel/component/activemq/ActiveMQComponentFactoryUserNamePassword.xml} (51%)
copy components/{camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringJMSTemplate.xml => camel-activemq/src/test/resources/org/apache/camel/component/activemq/ActiveMQComponentUserNamePassword.xml} (52%)
copy components/{camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpring.xml => camel-activemq/src/test/resources/org/apache/camel/component/activemq/BrowseQueuesInUFace-context.xml} (66%)
copy components/{camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringJMSTemplate.xml => camel-activemq/src/test/resources/org/apache/camel/component/activemq/CamelDestinationExclusiveConsumerTest-context.xml} (58%)
copy components/{camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringJMSTemplate.xml => camel-activemq/src/test/resources/org/apache/camel/component/activemq/SetHeaderTest-context.xml} (55%)
create mode 100644 components/camel-activemq/src/test/resources/org/apache/camel/component/activemq/dlq.xml
create mode 100644 components/camel-activemq/src/test/resources/org/apache/camel/component/activemq/jms-object-message.xml
create mode 100644 components/camel-activemq/src/test/resources/org/apache/camel/component/activemq/jmsBridge.xml
create mode 100644 components/camel-activemq/src/test/resources/org/apache/camel/component/activemq/jmsConsumeSendTransacted.xml
create mode 100644 components/camel-activemq/src/test/resources/org/apache/camel/component/activemq/jmsXajdbc.xml
create mode 100644 components/camel-activemq/src/test/resources/org/apache/camel/component/activemq/jmsXajdbcRollback.xml
create mode 100644 components/camel-activemq/src/test/resources/org/apache/camel/component/activemq/requestReply.xml
copy components/{camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringJMSTemplate.xml => camel-activemq/src/test/resources/org/apache/camel/component/activemq/spring.xml} (64%)
create mode 100644 components/camel-activemq/src/test/resources/org/apache/camel/component/activemq/transactedconsume.xml
create mode 100644 platforms/spring-boot/components-starter/camel-activemq-starter/pom.xml
create mode 100644 platforms/spring-boot/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentAutoConfiguration.java
create mode 100644 platforms/spring-boot/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-activemq-starter}/src/main/resources/META-INF/LICENSE.txt (100%)
copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-activemq-starter}/src/main/resources/META-INF/NOTICE.txt (100%)
create mode 100644 platforms/spring-boot/components-starter/camel-activemq-starter/src/main/resources/META-INF/spring.factories
create mode 100644 platforms/spring-boot/components-starter/camel-activemq-starter/src/main/resources/META-INF/spring.provides