svn commit: r1379306 - in /servicemix/smx4/features/trunk: camel/servicemix-camel/pom.xml camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java parent/pom.xml

[ffang]

Author: ffang
Date: Fri Aug 31 06:23:45 2012
New Revision: 1379306

URL: http://svn.apache.org/viewvc?rev=1379306&view=rev
Log:
[SXM4-1227]upgrade to camel 2.10.1

Modified:
    servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
    
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
    servicemix/smx4/features/trunk/parent/pom.xml

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml?rev=1379306&r1=1379305&r2=1379306&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Fri Aug 31 
06:23:45 2012
@@ -123,6 +123,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-spring</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

Modified: 
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java?rev=1379306&r1=1379305&r2=1379306&view=diff
==============================================================================
--- 
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
 (original)
+++ 
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
 Fri Aug 31 06:23:45 2012
@@ -52,7 +52,7 @@ public class ExceptionHandleTest extends
     protected static final String SERVICE_ADDRESS = "local://smx/hello_world";
     protected static final String SERVICE_CLASS = 
"serviceClass=org.apache.hello_world_soap_http.Greeter";
     private static final String WSDL_LOCATION = 
"wsdlURL=/wsdl/hello_world.wsdl";
-    private static final String SERVICE_NAME = 
"serviceName=%7bhttp://apache.org/hello_world_soap_http%7dSOAPService";;
+    private static final String SERVICE_NAME = 
"serviceName={http://apache.org/hello_world_soap_http}SOAPService";;
 
     private String routerEndpointURI = "cxf://" + ROUTER_ADDRESS + "?" + 
SERVICE_CLASS 
         + "&" + WSDL_LOCATION + "&" + SERVICE_NAME + 
"&dataFormat=POJO&bus=#Bus";

Modified: servicemix/smx4/features/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1379306&r1=1379305&r2=1379306&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/parent/pom.xml (original)
+++ servicemix/smx4/features/trunk/parent/pom.xml Fri Aug 31 06:23:45 2012
@@ -39,7 +39,7 @@
   <properties>
     <activemq.version>5.5.1</activemq.version>
     <activiti.version>5.9</activiti.version>
-    <camel.version>2.9.0</camel.version>
+    <camel.version>2.10.1</camel.version>
     <cxf.version>2.6.2</cxf.version>
 
     <felix.obr.version>1.6.4</felix.obr.version>