Author: ffang
Date: Thu Dec 22 03:36:00 2011
New Revision: 1222023
URL: http://svn.apache.org/viewvc?rev=1222023&view=rev
Log:
[SMXCOMP-918]upgrade to camel 2.9
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiComponent.java
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelConcurrentProducerCreationTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelContextEndpointLifeCycleTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JavaCamelRouteDslTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JavaCamelRouteTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiCamelErrorHandlingTestSupport.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiCamelExceptionsTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiConvertExceptionsTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDlcForCamelRouteTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDynamicRecipientListTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyAsyncCamelTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyCamelErrorHandlingTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlySecuritySubjectTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyToCamelObjectTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOptionalOutCamelTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutCamelErrorHandlingTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutCamelJMSFlowExceptionTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiOperationCamelTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiStrictSerializationTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiToCamelCbrTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/TestCamelRouter.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponentTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su12-src/camel-context.xml
servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su9-src/camel-context.xml
servicemix/components/trunk/pom.xml
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiComponent.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiComponent.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiComponent.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiComponent.java
Thu Dec 22 03:36:00 2011
@@ -16,14 +16,17 @@
*/
package org.apache.servicemix.camel;
+import java.util.Map;
+
import javax.xml.namespace.QName;
import org.apache.camel.*;
+import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.processor.UnitOfWorkProcessor;
import org.apache.servicemix.common.util.URIResolver;
import org.apache.servicemix.id.IdGenerator;
-public class JbiComponent implements Component {
+public class JbiComponent extends DefaultComponent {
private CamelComponent camelJbiComponent;
private CamelContext camelContext;
@@ -169,4 +172,10 @@ public class JbiComponent implements Com
}
return processor;
}
+
+ @Override
+ protected Endpoint createEndpoint(String arg0, String arg1, Map<String,
Object> arg2) throws Exception {
+ return createEndpoint(arg0);
+ }
+
}
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java
Thu Dec 22 03:36:00 2011
@@ -61,6 +61,7 @@ public class JbiEndpoint extends Default
public JbiEndpoint(JbiComponent jbiComponent, String uri) {
super(uri, jbiComponent);
this.jbiComponent = jbiComponent;
+ this.setEndpointUri(uri);
parseUri(uri);
//now create the binding based on the information read from the URI
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelConcurrentProducerCreationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelConcurrentProducerCreationTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelConcurrentProducerCreationTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelConcurrentProducerCreationTest.java
Thu Dec 22 03:36:00 2011
@@ -94,4 +94,4 @@ public class CamelConcurrentProducerCrea
protected void appendJbiActivationSpecs(List<ActivationSpec>
activationSpecList) {
// no additional JBI activation specs required
}
-}
\ No newline at end of file
+}
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelContextEndpointLifeCycleTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelContextEndpointLifeCycleTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelContextEndpointLifeCycleTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelContextEndpointLifeCycleTest.java
Thu Dec 22 03:36:00 2011
@@ -22,7 +22,7 @@ import java.net.URL;
import java.util.Collection;
import org.apache.camel.CamelContext;
-import org.apache.camel.impl.ServiceSupport;
+import org.apache.camel.spring.SpringCamelContext;
import org.apache.servicemix.common.Endpoint;
import org.apache.servicemix.common.ServiceUnit;
import org.slf4j.Logger;
@@ -57,14 +57,14 @@ public class CamelContextEndpointLifeCyc
assertTrue("It should be CamelContextEndpoint", endpoint
instanceof CamelContextEndpoint);
CamelContext camelContext =
((CamelContextEndpoint)endpoint).getCamelContext();
// check the CamelContextEndpoint status
- assertTrue("The CamelContext should be started",
((ServiceSupport)camelContext).isStarted());
+ assertTrue("The CamelContext should be started",
((SpringCamelContext)camelContext).isStarted());
// Stop
component.getServiceUnitManager().stop(suName);
// check the CamelContextEndpoint status
- assertTrue("The CamelContext should be stopped",
((ServiceSupport)camelContext).isStopped());
+ assertTrue("The CamelContext should be stopped",
((SpringCamelContext)camelContext).isStopped());
// reStart
component.getServiceUnitManager().start(suName);
- assertTrue("The CamelContext should be started",
((ServiceSupport)camelContext).isStarted());
+ assertTrue("The CamelContext should be started",
((SpringCamelContext)camelContext).isStarted());
component.getServiceUnitManager().stop(suName);
component.getServiceUnitManager().shutDown(suName);
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JavaCamelRouteDslTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JavaCamelRouteDslTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JavaCamelRouteDslTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JavaCamelRouteDslTest.java
Thu Dec 22 03:36:00 2011
@@ -49,4 +49,4 @@ public class JavaCamelRouteDslTest exten
assertNotNull(exchange.getMessage("out").getProperty("operation"));
assertEquals(exchange.getMessage("out").getProperty("operation").toString(),
"{http://test}echo";);
}
-}
\ No newline at end of file
+}
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JavaCamelRouteTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JavaCamelRouteTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JavaCamelRouteTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JavaCamelRouteTest.java
Thu Dec 22 03:36:00 2011
@@ -37,4 +37,4 @@ public class JavaCamelRouteTest extends
assertNotNull(exchange.getMessage("out").getProperty("operation"));
assertEquals(exchange.getMessage("out").getProperty("operation").toString(),
"{http://hello}echo";);
}
-}
\ No newline at end of file
+}
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiCamelErrorHandlingTestSupport.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiCamelErrorHandlingTestSupport.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiCamelErrorHandlingTestSupport.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiCamelErrorHandlingTestSupport.java
Thu Dec 22 03:36:00 2011
@@ -24,7 +24,7 @@ import javax.jbi.messaging.MessageExchan
import javax.jbi.messaging.MessagingException;
import javax.xml.namespace.QName;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.servicemix.MessageExchangeListener;
import org.apache.servicemix.components.util.ComponentSupport;
import org.apache.servicemix.jbi.container.ActivationSpec;
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiCamelExceptionsTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiCamelExceptionsTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiCamelExceptionsTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiCamelExceptionsTest.java
Thu Dec 22 03:36:00 2011
@@ -22,7 +22,7 @@ import javax.jbi.messaging.InOut;
import javax.xml.namespace.QName;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiConvertExceptionsTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiConvertExceptionsTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiConvertExceptionsTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiConvertExceptionsTest.java
Thu Dec 22 03:36:00 2011
@@ -23,7 +23,7 @@ import javax.xml.namespace.QName;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.exception.FaultException;
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDlcForCamelRouteTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDlcForCamelRouteTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDlcForCamelRouteTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDlcForCamelRouteTest.java
Thu Dec 22 03:36:00 2011
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.tck.ReceiverComponent;
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDynamicRecipientListTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDynamicRecipientListTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDynamicRecipientListTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDynamicRecipientListTest.java
Thu Dec 22 03:36:00 2011
@@ -24,7 +24,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.RecipientList;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.util.jndi.JndiContext;
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyAsyncCamelTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyAsyncCamelTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyAsyncCamelTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyAsyncCamelTest.java
Thu Dec 22 03:36:00 2011
@@ -24,7 +24,7 @@ import javax.xml.namespace.QName;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.container.ActivationSpec;
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyCamelErrorHandlingTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyCamelErrorHandlingTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyCamelErrorHandlingTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyCamelErrorHandlingTest.java
Thu Dec 22 03:36:00 2011
@@ -25,7 +25,7 @@ import javax.xml.namespace.QName;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.exception.FaultException;
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlySecuritySubjectTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlySecuritySubjectTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlySecuritySubjectTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlySecuritySubjectTest.java
Thu Dec 22 03:36:00 2011
@@ -27,7 +27,7 @@ import javax.xml.namespace.QName;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.container.ActivationSpec;
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyToCamelObjectTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyToCamelObjectTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyToCamelObjectTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyToCamelObjectTest.java
Thu Dec 22 03:36:00 2011
@@ -25,7 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.container.ActivationSpec;
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOptionalOutCamelTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOptionalOutCamelTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOptionalOutCamelTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOptionalOutCamelTest.java
Thu Dec 22 03:36:00 2011
@@ -24,7 +24,7 @@ import javax.xml.namespace.QName;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.servicemix.jbi.container.ActivationSpec;
/**
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutCamelErrorHandlingTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutCamelErrorHandlingTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutCamelErrorHandlingTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutCamelErrorHandlingTest.java
Thu Dec 22 03:36:00 2011
@@ -24,7 +24,7 @@ import javax.xml.namespace.QName;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.container.ActivationSpec;
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutCamelJMSFlowExceptionTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutCamelJMSFlowExceptionTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutCamelJMSFlowExceptionTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutCamelJMSFlowExceptionTest.java
Thu Dec 22 03:36:00 2011
@@ -25,7 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.exception.FaultException;
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java
Thu Dec 22 03:36:00 2011
@@ -23,7 +23,7 @@ import javax.jbi.messaging.NormalizedMes
import javax.jbi.servicedesc.ServiceEndpoint;
import javax.xml.namespace.QName;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.FaultException;
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiOperationCamelTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiOperationCamelTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiOperationCamelTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiOperationCamelTest.java
Thu Dec 22 03:36:00 2011
@@ -24,7 +24,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.servicemix.jbi.container.ActivationSpec;
/**
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiStrictSerializationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiStrictSerializationTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiStrictSerializationTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiStrictSerializationTest.java
Thu Dec 22 03:36:00 2011
@@ -26,7 +26,7 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.servicemix.camel.test.InvalidSerializableObject;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiToCamelCbrTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiToCamelCbrTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiToCamelCbrTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiToCamelCbrTest.java
Thu Dec 22 03:36:00 2011
@@ -26,7 +26,7 @@ import javax.xml.transform.stream.Stream
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.servicemix.client.DefaultServiceMixClient;
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/TestCamelRouter.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/TestCamelRouter.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/TestCamelRouter.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/TestCamelRouter.java
Thu Dec 22 03:36:00 2011
@@ -87,4 +87,4 @@ public class TestCamelRouter extends Cam
};
}
-}
\ No newline at end of file
+}
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponentTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponentTest.java?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponentTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponentTest.java
Thu Dec 22 03:36:00 2011
@@ -74,4 +74,4 @@ public class OsgiCamelJbiComponentTest e
// graciously do nothing
}
}
-}
\ No newline at end of file
+}
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su12-src/camel-context.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su12-src/camel-context.xml?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su12-src/camel-context.xml
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su12-src/camel-context.xml
Thu Dec 22 03:36:00 2011
@@ -70,6 +70,6 @@
<property name="backOffMultiplier" value="2" />
</bean>
- <bean id="logger" class="org.apache.camel.processor.CamelLogger" />
+ <bean id="logger" class="org.apache.camel.util.CamelLogger" />
</beans>
Modified:
servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su9-src/camel-context.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su9-src/camel-context.xml?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su9-src/camel-context.xml
(original)
+++
servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su9-src/camel-context.xml
Thu Dec 22 03:36:00 2011
@@ -70,6 +70,6 @@
<property name="backOffMultiplier" value="2" />
</bean>
- <bean id="logger" class="org.apache.camel.processor.CamelLogger" />
+ <bean id="logger" class="org.apache.camel.util.CamelLogger" />
</beans>
Modified: servicemix/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/pom.xml?rev=1222023&r1=1222022&r2=1222023&view=diff
==============================================================================
--- servicemix/components/trunk/pom.xml (original)
+++ servicemix/components/trunk/pom.xml Thu Dec 22 03:36:00 2011
@@ -85,7 +85,7 @@
<activemq.version>5.5.1</activemq.version>
<!-- Camel -->
- <camel.version>2.8.3</camel.version>
+ <camel.version>2.9.0-SNAPSHOT</camel.version>
<!-- CXF -->
<cxf.version>2.5.1</cxf.version>
