You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/07/28 16:30:02 UTC

svn commit: r798534 - in /camel/trunk/components/camel-jms/src/test: java/org/apache/camel/component/jms/tx/ resources/org/apache/camel/component/jms/issues/ resources/org/apache/camel/component/jms/tx/

Author: davsclaus
Date: Tue Jul 28 14:30:02 2009
New Revision: 798534

URL: http://svn.apache.org/viewvc?rev=798534&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/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/MyActiveMQConsumer.java
    camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/broker.xml
    camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/camelBrokerClient.xml
    camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
    camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml

Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/MyActiveMQConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/MyActiveMQConsumer.java?rev=798534&r1=798533&r2=798534&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/MyActiveMQConsumer.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/MyActiveMQConsumer.java Tue Jul 28 14:30:02 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/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/broker.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/broker.xml?rev=798534&r1=798533&r2=798534&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/broker.xml (original)
+++ camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/broker.xml Tue Jul 28 14:30:02 2009
@@ -39,7 +39,7 @@
         </amq:destinationPolicy>
 
         <amq:transportConnectors>
-            <amq:transportConnector uri="tcp://localhost:61616"/>
+            <amq:transportConnector uri="vm://localhost"/>
         </amq:transportConnectors>
 
     </amq:broker>

Modified: camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/camelBrokerClient.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/camelBrokerClient.xml?rev=798534&r1=798533&r2=798534&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/camelBrokerClient.xml (original)
+++ camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/camelBrokerClient.xml Tue Jul 28 14:30:02 2009
@@ -35,7 +35,7 @@
     <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory" destroy-method="stop">
         <property name="connectionFactory">
             <bean class="org.apache.activemq.ActiveMQConnectionFactory">
-                <property name="brokerURL" value="tcp://localhost:61616"/>
+                <property name="brokerURL" value="vm://localhost"/>
             </bean>
         </property>
         <property name="maxConnections" value="8"/>

Modified: camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml?rev=798534&r1=798533&r2=798534&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml (original)
+++ camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml Tue Jul 28 14:30:02 2009
@@ -24,7 +24,7 @@
 
    <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/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml?rev=798534&r1=798533&r2=798534&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml (original)
+++ camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml Tue Jul 28 14:30:02 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">