You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/07/28 10:05:46 UTC
svn commit: r1366606 - in /camel/trunk/components/camel-jms/src/test: java/org/apache/camel/component/jms/activemq/ resources/org/apache/camel/component/jms/activemq/

Author: bvahdat
Date: Sat Jul 28 08:05:45 2012
New Revision: 1366606

URL: http://svn.apache.org/viewvc?rev=1366606&view=rev
Log:
Simplified the setup of the two brokers.

Added:
    camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq/twoActiveMQBrokers.xml
      - copied, changed from r1366604, camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq/camelBrokersClient.xml
Removed:
    camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq/brokers.xml
    camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq/camelBrokersClient.xml
Modified:
    camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/activemq/TwoEmbeddedActiveMQBrokersTest.java

Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/activemq/TwoEmbeddedActiveMQBrokersTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/activemq/TwoEmbeddedActiveMQBrokersTest.java?rev=1366606&r1=1366605&r2=1366606&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/activemq/TwoEmbeddedActiveMQBrokersTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/activemq/TwoEmbeddedActiveMQBrokersTest.java Sat Jul 28 08:05:45 2012
@@ -38,8 +38,7 @@ public class TwoEmbeddedActiveMQBrokersT
     }
 
     protected AbstractXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext(new String[] {"classpath:org/apache/camel/component/jms/activemq/brokers.xml",
-                                                                "classpath:org/apache/camel/component/jms/activemq/camelBrokersClient.xml"});
+        return new ClassPathXmlApplicationContext("classpath:org/apache/camel/component/jms/activemq/twoActiveMQBrokers.xml");
     }
 
 }
\ No newline at end of file

Copied: camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq/twoActiveMQBrokers.xml (from r1366604, camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq/camelBrokersClient.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq/twoActiveMQBrokers.xml?p2=camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq/twoActiveMQBrokers.xml&p1=camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq/camelBrokersClient.xml&r1=1366604&r2=1366606&rev=1366606&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq/camelBrokersClient.xml (original)
+++ camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq/twoActiveMQBrokers.xml Sat Jul 28 08:05:45 2012
@@ -35,11 +35,19 @@
    </camelContext>
 
    <bean id="activemq1" class="org.apache.activemq.camel.component.ActiveMQComponent">
-      <property name="brokerURL" value="vm://myBroker1" />
+      <property name="connectionFactory">
+         <bean class="org.apache.activemq.spring.ActiveMQConnectionFactory">
+            <property name="brokerURL" value="vm://firstBroker?broker.persistent=false&amp;broker.useJmx=false" />
+         </bean>
+      </property>
    </bean>
 
    <bean id="activemq2" class="org.apache.activemq.camel.component.ActiveMQComponent">
-      <property name="brokerURL" value="vm://myBroker2" />
+      <property name="connectionFactory">
+         <bean class="org.apache.activemq.spring.ActiveMQConnectionFactory">
+            <property name="brokerURL" value="vm://secondBroker?broker.persistent=false&amp;broker.useJmx=false" />
+         </bean>
+      </property>
    </bean>
 
 </beans>