Author: davsclaus
Date: Tue Jul 28 14:09:18 2009
New Revision: 798532
URL: http://svn.apache.org/viewvc?rev=798532&view=rev
Log:
Using VM for unit testing camel-jms to be more reliable for CI servers to avoid
ports already in use.
Modified:
camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/MyActiveMQConsumer.java
camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml
Modified:
camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/MyActiveMQConsumer.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/MyActiveMQConsumer.java?rev=798532&r1=798531&r2=798532&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/MyActiveMQConsumer.java
(original)
+++
camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/MyActiveMQConsumer.java
Tue Jul 28 14:09:18 2009
@@ -31,7 +31,7 @@
import org.apache.commons.logging.LogFactory;
public class MyActiveMQConsumer implements Runnable {
- public static final String ACTIVEMQ_BROKER_URI =
"failover:tcp://localhost:61616";
+ public static final String ACTIVEMQ_BROKER_URI = "failover:vm://localhost";
public static final String REQUEST_QUEUE = "request";
private static final transient Log LOG =
LogFactory.getLog(MyActiveMQConsumer.class);
Modified:
camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml?rev=798532&r1=798531&r2=798532&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
(original)
+++
camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
Tue Jul 28 14:09:18 2009
@@ -20,11 +20,11 @@
xmlns:broker="http://activemq.apache.org/schema/core";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd";>
+ http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd";>
<broker:broker id="broker" useJmx="false" persistent="false"
dataDirectory="target/activemq">
<broker:transportConnectors>
- <broker:transportConnector name="openwire" uri="tcp://localhost:61616"/>
+ <broker:transportConnector name="openwire" uri="vm://localhost"/>
</broker:transportConnectors>
</broker:broker>
Modified:
camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml?rev=798532&r1=798531&r2=798532&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml
(original)
+++
camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml
Tue Jul 28 14:09:18 2009
@@ -19,7 +19,7 @@
</bean>
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="tcp://localhost:61616"/>
+ <property name="brokerURL" value="vm://localhost"/>
</bean>
<bean id="jmsTransactionManager"
class="org.springframework.jms.connection.JmsTransactionManager">
