CAMEL-7669: jms unit tests should start|stop connection pool.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3d14a21d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3d14a21d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3d14a21d Branch: refs/heads/master Commit: 3d14a21d9e3e5d33c8420b0210e68a90e3611442 Parents: 3d8ae86 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Aug 7 16:47:15 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Aug 7 16:47:15 2014 +0200 ---------------------------------------------------------------------- .../org/apache/camel/itest/hawtdb/JmsToHawtDBAggregateTest.xml | 2 +- .../camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml | 1 + .../org/apache/camel/itest/jetty/JettyJmsShutdownTest-context.xml | 1 + .../org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.xml | 2 +- .../resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml | 2 +- .../camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.xml | 2 +- .../org/apache/camel/itest/jms/JmsPollingConsumerTest-context.xml | 2 +- .../org/apache/camel/itest/tx/JmsToHttpTXTest-context.xml | 2 +- ...ExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml | 2 +- .../camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml | 2 +- .../apache/camel/itest/tx/JmsToHttpTXWithRollbackTest-context.xml | 2 +- 11 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3d14a21d/tests/camel-itest/src/test/resources/org/apache/camel/itest/hawtdb/JmsToHawtDBAggregateTest.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/hawtdb/JmsToHawtDBAggregateTest.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/hawtdb/JmsToHawtDBAggregateTest.xml index e22af04..b15a1d5 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/hawtdb/JmsToHawtDBAggregateTest.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/hawtdb/JmsToHawtDBAggregateTest.xml @@ -22,7 +22,7 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd";> <!-- ActiveMQ connection factory --> - <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"> + <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start" destroy-method="stop"> <property name="maxConnections" value="8"/> <property name="connectionFactory" ref="jmsConnectionFactory"/> </bean> http://git-wip-us.apache.org/repos/asf/camel/blob/3d14a21d/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml index 680ce5a..49bec72 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml @@ -24,6 +24,7 @@ <bean id="properties" class="org.apache.camel.component.properties.PropertiesComponent"/> <bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent"> <property name="brokerURL" value="vm://localhost?broker.persistent=false"/> + <property name="acceptMessagesWhileStopping" value="true"/> </bean> <camelContext xmlns="http://camel.apache.org/schema/spring";> http://git-wip-us.apache.org/repos/asf/camel/blob/3d14a21d/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownTest-context.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownTest-context.xml index faafe15..6766ca6 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownTest-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownTest-context.xml @@ -26,6 +26,7 @@ <bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent"> <property name="brokerURL" value="vm://localhost?broker.persistent=false"/> + <property name="acceptMessagesWhileStopping" value="true"/> </bean> <camelContext xmlns="http://camel.apache.org/schema/spring";> http://git-wip-us.apache.org/repos/asf/camel/blob/3d14a21d/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.xml index 8f145ff..a0decab 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.xml @@ -21,7 +21,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd";> - <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"> + <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start" destroy-method="stop"> <property name="maxConnections" value="8"/> <property name="connectionFactory" ref="jmsConnectionFactory"/> </bean> http://git-wip-us.apache.org/repos/asf/camel/blob/3d14a21d/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml index 3caedc5..148508c 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml @@ -24,7 +24,7 @@ http://activemq.apache.org/schema/core http://activemq.org/config/1.0/1.0.xsd";> <!-- camel stuff below to send and listen to broker with a spring JMS transaction manager --> - <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"> + <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start" destroy-method="stop"> <property name="maxConnections" value="8"/> <property name="connectionFactory" ref="jmsConnectionFactory"/> </bean> http://git-wip-us.apache.org/repos/asf/camel/blob/3d14a21d/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.xml index 0a3782e..aa0da27 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.xml @@ -24,7 +24,7 @@ <bean id="properties" class="org.apache.camel.component.properties.PropertiesComponent"/> - <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"> + <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start" destroy-method="stop"> <property name="maxConnections" value="8"/> <property name="connectionFactory" ref="jmsConnectionFactory"/> </bean> http://git-wip-us.apache.org/repos/asf/camel/blob/3d14a21d/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsPollingConsumerTest-context.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsPollingConsumerTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsPollingConsumerTest-context.xml index cfbd304..d3ba9f7 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsPollingConsumerTest-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsPollingConsumerTest-context.xml @@ -31,7 +31,7 @@ </broker:broker> <!-- camel stuff below to send and listen to broker with a spring JMS transaction manager --> - <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"> + <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start" destroy-method="stop"> <property name="maxConnections" value="8"/> <property name="connectionFactory" ref="jmsConnectionFactory"/> </bean> http://git-wip-us.apache.org/repos/asf/camel/blob/3d14a21d/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXTest-context.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXTest-context.xml index dcbf19e..6e8a44d 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXTest-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXTest-context.xml @@ -22,7 +22,7 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd";> <!-- ActiveMQ connection factory --> - <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"> + <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start" destroy-method="stop"> <property name="maxConnections" value="8"/> <property name="connectionFactory" ref="jmsConnectionFactory"/> </bean> http://git-wip-us.apache.org/repos/asf/camel/blob/3d14a21d/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml index d6c7da1..870cc5e 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml @@ -22,7 +22,7 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd";> <!-- ActiveMQ connection factory --> - <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"> + <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start" destroy-method="stop"> <property name="maxConnections" value="8"/> <property name="connectionFactory" ref="jmsConnectionFactory"/> </bean> http://git-wip-us.apache.org/repos/asf/camel/blob/3d14a21d/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml index 1fcdae1..d81557f 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml @@ -22,7 +22,7 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd";> <!-- ActiveMQ connection factory --> - <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"> + <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start" destroy-method="stop"> <property name="maxConnections" value="8"/> <property name="connectionFactory" ref="jmsConnectionFactory"/> </bean> http://git-wip-us.apache.org/repos/asf/camel/blob/3d14a21d/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest-context.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest-context.xml index b79347f..a77c03f 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest-context.xml @@ -22,7 +22,7 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd";> <!-- ActiveMQ connection factory --> - <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"> + <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start" destroy-method="stop"> <property name="maxConnections" value="8"/> <property name="connectionFactory" ref="jmsConnectionFactory"/> </bean>
