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 2010/02/01 16:56:53 UTC
svn commit: r905315 - in
/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest:
greeter/ jetty/ jms/ tx/
Author: davsclaus
Date: Mon Feb 1 15:56:52 2010
New Revision: 905315
URL: http://svn.apache.org/viewvc?rev=905315&view=rev
Log:
Reduced the need for AMQ broker with live TCP connection.
Modified:
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest-context.xml
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml?rev=905315&r1=905314&r2=905315&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml Mon Feb 1 15:56:52 2010
@@ -25,7 +25,6 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <import resource="classpath:activemq.xml" />
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
@@ -44,14 +43,9 @@
<bean id="jmsPrepareRequest" class="org.apache.camel.itest.greeter.JmsPrepareRequest"/>
<bean id="jmsPrepareResponse" class="org.apache.camel.itest.greeter.JmsPrepareResponse"/>
- <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
- <property name="connectionFactory">
- <bean class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
- value="vm://localhost?broker.persistent=false" />
- </bean>
- </property>
- </bean>
+ <bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent">
+ <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
+ </bean>
<!-- START SNIPPET: example -->
<camelContext xmlns="http://camel.apache.org/schema/spring">
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml?rev=905315&r1=905314&r2=905315&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml Mon Feb 1 15:56:52 2010
@@ -25,7 +25,6 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <import resource="classpath:activemq.xml" />
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
@@ -44,14 +43,9 @@
<bean id="prepareRequest" class="org.apache.camel.itest.greeter.PrepareRequest"/>
<bean id="prepareResponse" class="org.apache.camel.itest.greeter.PrepareResponse"/>
- <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
- <property name="connectionFactory">
- <bean class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
- value="vm://localhost?broker.persistent=false" />
- </bean>
- </property>
- </bean>
+ <bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent">
+ <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
+ </bean>
<!-- START SNIPPET: example -->
<camelContext xmlns="http://camel.apache.org/schema/spring">
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml?rev=905315&r1=905314&r2=905315&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml Mon Feb 1 15:56:52 2010
@@ -17,7 +17,6 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
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://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml?rev=905315&r1=905314&r2=905315&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml Mon Feb 1 15:56:52 2010
@@ -23,32 +23,25 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <import resource="classpath:activemq.xml" />
+ <bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent">
+ <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
+ </bean>
- <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
- <property name="connectionFactory">
- <bean class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
- value="vm://localhost?broker.persistent=false" />
- </bean>
- </property>
- </bean>
+ <bean id="setExchangePatternProcessor" class="org.apache.camel.itest.jetty.SetExchangePatternProcessor"/>
- <bean id="setExchangePatternProcessor" class="org.apache.camel.itest.jetty.SetExchangePatternProcessor"/>
-
- <!-- START SNIPPET: example -->
- <camelContext xmlns="http://camel.apache.org/schema/spring" trace="true">
- <route>
- <from uri="jetty:http://localhost:9000/test"/>
- <to uri="log:MyCategory?level=INFO"/>
- <process ref="setExchangePatternProcessor"/>
- <to uri="jms:responseQueue"/>
- </route>
- <route>
- <from uri="jms:responseQueue"/>
- <to uri="mock:resultEndpoint"/>
- </route>
- </camelContext>
- <!-- END SNIPPET: example -->
+ <!-- START SNIPPET: example -->
+ <camelContext xmlns="http://camel.apache.org/schema/spring" trace="true">
+ <route>
+ <from uri="jetty:http://localhost:9000/test"/>
+ <to uri="log:MyCategory?level=INFO"/>
+ <process ref="setExchangePatternProcessor"/>
+ <to uri="jms:responseQueue"/>
+ </route>
+ <route>
+ <from uri="jms:responseQueue"/>
+ <to uri="mock:resultEndpoint"/>
+ </route>
+ </camelContext>
+ <!-- END SNIPPET: example -->
</beans>
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml?rev=905315&r1=905314&r2=905315&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml Mon Feb 1 15:56:52 2010
@@ -23,30 +23,23 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <import resource="classpath:activemq.xml" />
+ <bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent">
+ <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
+ </bean>
- <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
- <property name="connectionFactory">
- <bean class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
- value="vm://localhost?broker.persistent=false" />
- </bean>
- </property>
- </bean>
+ <bean id="setResponseProcessor" class="org.apache.camel.itest.jetty.SetResponseProcessor"/>
- <bean id="setResponseProcessor" class="org.apache.camel.itest.jetty.SetResponseProcessor"/>
-
- <!-- START SNIPPET: example -->
- <camelContext xmlns="http://camel.apache.org/schema/spring" trace="true">
- <route>
- <from uri="jetty:http://localhost:9000/test"/>
- <to uri="jms:responseQueue"/>
- </route>
- <route>
- <from uri="jms:responseQueue"/>
- <process ref="setResponseProcessor"/>
- </route>
- </camelContext>
- <!-- END SNIPPET: example -->
+ <!-- START SNIPPET: example -->
+ <camelContext xmlns="http://camel.apache.org/schema/spring" trace="true">
+ <route>
+ <from uri="jetty:http://localhost:9000/test"/>
+ <to uri="jms:responseQueue"/>
+ </route>
+ <route>
+ <from uri="jms:responseQueue"/>
+ <process ref="setResponseProcessor"/>
+ </route>
+ </camelContext>
+ <!-- END SNIPPET: example -->
</beans>
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest-context.xml?rev=905315&r1=905314&r2=905315&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest-context.xml Mon Feb 1 15:56:52 2010
@@ -23,14 +23,8 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <import resource="classpath:activemq.xml"/>
-
- <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
- <property name="connectionFactory">
- <bean class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
- </bean>
- </property>
+ <bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent">
+ <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
</bean>
<camelContext xmlns="http://camel.apache.org/schema/spring" trace="true">
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml?rev=905315&r1=905314&r2=905315&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml Mon Feb 1 15:56:52 2010
@@ -23,13 +23,6 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
http://activemq.apache.org/schema/core http://activemq.org/config/1.0/1.0.xsd">
- <!-- activemq broker -->
- <broker:broker useJmx="false" persistent="false" brokerName="localhost">
- <broker:transportConnectors>
- <broker:transportConnector name="tcp" uri="vm://localhost?broker.persistent=false"/>
- </broker:transportConnectors>
- </broker:broker>
-
<!-- camel stuff below to send and listen to broker with a spring JMS transaction manager -->
<bean id="jmsFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXTest-context.xml?rev=905315&r1=905314&r2=905315&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXTest-context.xml Mon Feb 1 15:56:52 2010
@@ -17,22 +17,13 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:broker="http://activemq.apache.org/schema/core"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- http://activemq.apache.org/schema/core http://activemq.org/config/1.0/1.0.xsd">
-
- <!-- ActiveMQ broker -->
- <broker:broker useJmx="false" persistent="false" brokerName="localhost">
- <broker:transportConnectors>
- <broker:transportConnector name="tcp" uri="tcp://localhost:61616"/>
- </broker:transportConnectors>
- </broker:broker>
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- ActiveMQ connection factory -->
<bean id="jmsFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="tcp://localhost:61616"/>
+ <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
</bean>
<!-- Spring JMX TX manager -->
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml?rev=905315&r1=905314&r2=905315&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml Mon Feb 1 15:56:52 2010
@@ -17,22 +17,13 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:broker="http://activemq.apache.org/schema/core"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- http://activemq.apache.org/schema/core http://activemq.org/config/1.0/1.0.xsd">
-
- <!-- ActiveMQ broker -->
- <broker:broker useJmx="false" persistent="false" brokerName="localhost">
- <broker:transportConnectors>
- <broker:transportConnector name="tcp" uri="tcp://localhost:61616"/>
- </broker:transportConnectors>
- </broker:broker>
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- ActiveMQ connection factory -->
<bean id="jmsFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="tcp://localhost:61616"/>
+ <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
</bean>
<!-- Spring JMX TX manager -->
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml?rev=905315&r1=905314&r2=905315&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml Mon Feb 1 15:56:52 2010
@@ -17,22 +17,13 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:broker="http://activemq.apache.org/schema/core"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- http://activemq.apache.org/schema/core http://activemq.org/config/1.0/1.0.xsd">
-
- <!-- ActiveMQ broker -->
- <broker:broker useJmx="false" persistent="false" brokerName="localhost">
- <broker:transportConnectors>
- <broker:transportConnector name="tcp" uri="tcp://localhost:61616"/>
- </broker:transportConnectors>
- </broker:broker>
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- ActiveMQ connection factory -->
<bean id="jmsFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="tcp://localhost:61616"/>
+ <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
</bean>
<!-- Spring JMX TX manager -->
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest-context.xml?rev=905315&r1=905314&r2=905315&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest-context.xml Mon Feb 1 15:56:52 2010
@@ -17,22 +17,13 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:broker="http://activemq.apache.org/schema/core"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- http://activemq.apache.org/schema/core http://activemq.org/config/1.0/1.0.xsd">
-
- <!-- ActiveMQ broker -->
- <broker:broker useJmx="false" persistent="false" brokerName="localhost">
- <broker:transportConnectors>
- <broker:transportConnector name="tcp" uri="tcp://localhost:61616"/>
- </broker:transportConnectors>
- </broker:broker>
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- ActiveMQ connection factory -->
<bean id="jmsFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="tcp://localhost:61616"/>
+ <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
</bean>
<!-- Spring JMX TX manager -->