You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/10/28 15:08:05 UTC
svn commit: r1028287 - in
/servicemix/components/engines/servicemix-camel/trunk: ./
src/test/java/org/apache/servicemix/camel/
src/test/resources/org/apache/servicemix/camel/su1-src/
src/test/resources/org/apache/servicemix/camel/su10-src/ src/test/res...
Author: jbonofre
Date: Thu Oct 28 13:08:04 2010
New Revision: 1028287
URL: http://svn.apache.org/viewvc?rev=1028287&view=rev
Log:
[SMXCOMP-810] In preparation of Camel 2.5, servicemix-camel now uses Camel 2.5-SNAPSHOT.
Modified:
servicemix/components/engines/servicemix-camel/trunk/pom.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su1-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su10-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su11-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su12-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su2-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su3-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su4-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su5-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su6-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su7-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su8-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su9-src/camel-context.xml
Modified: servicemix/components/engines/servicemix-camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/pom.xml?rev=1028287&r1=1028286&r2=1028287&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/pom.xml Thu Oct 28 13:08:04 2010
@@ -37,7 +37,7 @@
</scm>
<properties>
- <camel-version>2.4.0</camel-version>
+ <camel-version>2.5-SNAPSHOT</camel-version>
<servicemix.osgi.import>
!org.apache.servicemix.camel*,
!META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.camel,
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutTest.java?rev=1028287&r1=1028286&r2=1028287&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutTest.java Thu Oct 28 13:08:04 2010
@@ -32,7 +32,7 @@ public class JbiInOutTest extends NonJbi
*/
@Override
protected void setUp() throws Exception {
- suName = "su5";
+ suName = "su13";
super.setUp();
MyEchoComponent echo = new MyEchoComponent();
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su1-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su1-src/camel-context.xml?rev=1028287&r1=1028286&r2=1028287&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su1-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su1-src/camel-context.xml Thu Oct 28 13:08:04 2010
@@ -25,7 +25,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring" id="su1">
<route>
<from uri="seda:a?waitForTaskToComplete=Never"/>
<to uri="log:b"/>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su10-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su10-src/camel-context.xml?rev=1028287&r1=1028286&r2=1028287&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su10-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su10-src/camel-context.xml Thu Oct 28 13:08:04 2010
@@ -25,7 +25,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring" id="su10">
<route>
<from uri="mina:tcp://localhost:6200?textline=true"/>
<to uri="mock:result"/>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su11-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su11-src/camel-context.xml?rev=1028287&r1=1028286&r2=1028287&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su11-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su11-src/camel-context.xml Thu Oct 28 13:08:04 2010
@@ -24,7 +24,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
- <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring" id="su11">
<routeBuilder ref="configuredRouteBuilder"/>
</camelContext>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su12-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su12-src/camel-context.xml?rev=1028287&r1=1028286&r2=1028287&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su12-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su12-src/camel-context.xml Thu Oct 28 13:08:04 2010
@@ -25,7 +25,8 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring" id="su12">
+ <jmxAgent id="agent" disabled="true"/>
<route streamCache="true" handleFault="true" errorHandlerRef="deadLetterErrorHandler">
<from uri="jbi:service:urn:test:fault-handled-true"/>
<onException>
@@ -39,10 +40,10 @@
</onException>
<onException>
<!-- This clause is needed for testing since the test client still
- throws the older org.apache.servicemix.jbi.FaultException. You
- only need to catch org.apache.servicemix.jbi.exception.FaultException
+ throws the older org.apache.servicemix.jbi.FaultException. You
+ only need to catch org.apache.servicemix.jbi.exception.FaultException
in runtime scenarios.
-
+
TODO remove this when ServiceMix 3.3.1 is released.
-->
<exception>org.apache.servicemix.jbi.FaultException</exception>
@@ -51,7 +52,7 @@
<constant>true</constant>
</handled>
<to uri="jbi:service:urn:test:receiver-service"/>
- </onException>
+ </onException>
<to uri="jbi:service:urn:test:faulty-service?mep=robust-in-only"/>
</route>
</camelContext>
@@ -61,7 +62,7 @@
<property name="deadLetterUri" value="log:dlc"/>
<property name="redeliveryPolicy" ref="redeliveryPolicyConfig" />
</bean>
-
+
<bean id="redeliveryPolicyConfig" class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="0" />
<property name="redeliverDelay" value="2000" />
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su2-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su2-src/camel-context.xml?rev=1028287&r1=1028286&r2=1028287&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su2-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su2-src/camel-context.xml Thu Oct 28 13:08:04 2010
@@ -25,7 +25,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring" id="su2">
<route>
<from uri="jbi:endpoint:http://foo.bar.org/myService/myEndpointName"/>
<to uri="log:b"/>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su3-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su3-src/camel-context.xml?rev=1028287&r1=1028286&r2=1028287&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su3-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su3-src/camel-context.xml Thu Oct 28 13:08:04 2010
@@ -25,7 +25,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring" id="su3">
<route>
<from uri="jbi:service:http://foo.bar.org/myService"/>
<to uri="log:b"/>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su4-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su4-src/camel-context.xml?rev=1028287&r1=1028286&r2=1028287&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su4-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su4-src/camel-context.xml Thu Oct 28 13:08:04 2010
@@ -25,7 +25,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring" id="su4">
<route>
<from uri="jbi:name:cheese"/>
<to uri="log:b"/>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su5-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su5-src/camel-context.xml?rev=1028287&r1=1028286&r2=1028287&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su5-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su5-src/camel-context.xml Thu Oct 28 13:08:04 2010
@@ -25,7 +25,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring" id="su5">
<route>
<from uri="jbi:name:cheese"/>
<to uri="log:Su5Log" />
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su6-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su6-src/camel-context.xml?rev=1028287&r1=1028286&r2=1028287&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su6-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su6-src/camel-context.xml Thu Oct 28 13:08:04 2010
@@ -25,7 +25,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring" id="su6">
<package>org.apache.servicemix.camel.su6</package>
</camelContext>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su7-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su7-src/camel-context.xml?rev=1028287&r1=1028286&r2=1028287&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su7-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su7-src/camel-context.xml Thu Oct 28 13:08:04 2010
@@ -25,7 +25,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring" id="su7">
<package>org.apache.servicemix.camel.su7</package>
</camelContext>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su8-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su8-src/camel-context.xml?rev=1028287&r1=1028286&r2=1028287&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su8-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su8-src/camel-context.xml Thu Oct 28 13:08:04 2010
@@ -25,7 +25,8 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring" id="su8">
+ <jmxAgent id="agent" disabled="true"/>
<route streamCache="true" handleFault="true" errorHandlerRef="deadLetterErrorHandler">
<from uri="jbi:service:urn:test:error-handled-true"/>
<onException>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su9-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su9-src/camel-context.xml?rev=1028287&r1=1028286&r2=1028287&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su9-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su9-src/camel-context.xml Thu Oct 28 13:08:04 2010
@@ -25,7 +25,8 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring" id="su9">
+ <jmxAgent id="agent" disabled="true"/>
<route streamCache="true" handleFault="true" errorHandlerRef="deadLetterErrorHandler">
<from uri="jbi:service:urn:test:fault-handled-true"/>
<onException>