camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject svn commit: r790910 - in /camel/branches/camel-1.x: ./ tests/camel-itest/src/test/resources/spring-config/
Date Fri, 03 Jul 2009 13:33:35 GMT
Author: janstey
Date: Fri Jul  3 13:33:35 2009
New Revision: 790910

URL: http://svn.apache.org/viewvc?rev=790910&view=rev
Log:
Merged revisions 790907 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r790907 | janstey | 2009-07-03 09:28:07 -0400 (Fri, 03 Jul 2009) | 1 line
  
  CAMEL-1793 - switch to VM transport to fix test hang
........

Modified:
    camel/branches/camel-1.x/   (props changed)
    camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/jms-applicationContext.xml
    camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
    camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/jms-applicationContext.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/jms-applicationContext.xml?rev=790910&r1=790909&r2=790910&view=diff
==============================================================================
--- camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/jms-applicationContext.xml
(original)
+++ camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/jms-applicationContext.xml
Fri Jul  3 13:33:35 2009
@@ -26,7 +26,7 @@
 
 	<bean id="jmsConnectionFactory"
 		class="org.apache.activemq.ActiveMQConnectionFactory">
-		<property name="brokerURL" value="tcp://localhost:61616" />
+		<property name="brokerURL" value="vm://localhost" />
 	</bean>
 
 </beans>

Modified: camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml?rev=790910&r1=790909&r2=790910&view=diff
==============================================================================
--- camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
(original)
+++ camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
Fri Jul  3 13:33:35 2009
@@ -15,7 +15,7 @@
 
     <broker:broker useJmx="false" persistent="false" brokerName="localhost">
         <broker:transportConnectors>
-            <broker:transportConnector name="tcp" uri="tcp://localhost:61616"/>
+            <broker:transportConnector name="vm" uri="vm://localhost"/>
         </broker:transportConnectors>
     </broker:broker>
 

Modified: camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml?rev=790910&r1=790909&r2=790910&view=diff
==============================================================================
--- camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
(original)
+++ camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
Fri Jul  3 13:33:35 2009
@@ -33,7 +33,7 @@
 
     <broker:broker useJmx="false" persistent="false" brokerName="localhost">
         <broker:transportConnectors>
-            <broker:transportConnector name="tcp" uri="tcp://localhost:61616"/>
+            <broker:transportConnector name="vm" uri="vm://localhost"/>
         </broker:transportConnectors>
     </broker:broker>
 



Mime
View raw message