Repository: camel Updated Branches: refs/heads/master 3b7abccea -> 7d715c895
CAMEL-9338: Upgrade Spring Integration to version 4.2.2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ccfa2ded Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ccfa2ded Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ccfa2ded Branch: refs/heads/master Commit: ccfa2dedaf54a46052aca5fb3ee32db80ef28314 Parents: 3b7abcc Author: Pascal Schumacher <pascalschumac...@gmx.net> Authored: Sun Dec 6 22:02:14 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Dec 10 08:06:41 2015 +0100 ---------------------------------------------------------------------- components/camel-spring-integration/pom.xml | 3 ++- .../integration/SpringIntegrationBinding.java | 10 +++++----- .../integration/SpringIntegrationConsumer.java | 20 ++++++++++---------- .../integration/SpringIntegrationEndpoint.java | 2 +- .../integration/SpringIntegrationMessage.java | 8 ++++---- .../integration/SpringIntegrationProducer.java | 20 ++++++++++---------- .../integration/adapter/CamelSourceAdapter.java | 10 +++++----- .../integration/adapter/CamelTargetAdapter.java | 10 +++++----- .../converter/SpringIntegrationConverter.java | 12 ++++++------ .../SpringIntegrationOneWayConsumerTest.java | 4 ++-- .../SpringIntegrationTwoWayConsumerTest.java | 10 +++++----- .../adapter/CamelSourceAdapterTest.java | 4 ++-- .../adapter/CamelTargetAdapterTest.java | 10 +++++----- parent/pom.xml | 2 +- 14 files changed, 63 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/components/camel-spring-integration/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/pom.xml b/components/camel-spring-integration/pom.xml index 45a230e..1d3e50f 100644 --- a/components/camel-spring-integration/pom.xml +++ b/components/camel-spring-integration/pom.xml @@ -31,7 +31,8 @@ <properties> <camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg> - <camel.osgi.import.before.defaults>org.springframework.integration.*;version="[2,3)"</camel.osgi.import.before.defaults> + <camel.osgi.import.before.defaults>org.springframework.integration.*;version="[4" + org.springframework.messaging.*;version="[4"</camel.osgi.import.before.defaults> <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spring-integration</camel.osgi.export.service> <!-- must use older spring version --> http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java index 7d2c119..4f7d049 100644 --- a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java +++ b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java @@ -19,7 +19,7 @@ package org.apache.camel.component.spring.integration; import java.util.Map; import org.apache.camel.Exchange; -import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.support.GenericMessage; /** * The helper class for Mapping between the Spring Integration message and the Camel Message. @@ -32,20 +32,20 @@ public final class SpringIntegrationBinding { // Helper class } - public static org.springframework.integration.Message<?> createSpringIntegrationMessage(Exchange exchange) { + public static org.springframework.messaging.Message<?> createSpringIntegrationMessage(Exchange exchange) { return createSpringIntegrationMessage(exchange, exchange.getIn().getHeaders()); } - public static org.springframework.integration.Message<?> createSpringIntegrationMessage(Exchange exchange, Map<String, Object> headers) { + public static org.springframework.messaging.Message<?> createSpringIntegrationMessage(Exchange exchange, Map<String, Object> headers) { org.apache.camel.Message message = exchange.getIn(); return new GenericMessage<Object>(message.getBody(), headers); } - public static org.springframework.integration.Message<?> storeToSpringIntegrationMessage(org.apache.camel.Message message) { + public static org.springframework.messaging.Message<?> storeToSpringIntegrationMessage(org.apache.camel.Message message) { return new GenericMessage<Object>(message.getBody(), message.getHeaders()); } - public static void storeToCamelMessage(org.springframework.integration.Message<?> siMessage, org.apache.camel.Message cMessage) { + public static void storeToCamelMessage(org.springframework.messaging.Message<?> siMessage, org.apache.camel.Message cMessage) { cMessage.setBody(siMessage.getPayload()); cMessage.setHeaders(siMessage.getHeaders()); } http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java index 20e6398..d572ebe 100644 --- a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java +++ b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java @@ -22,11 +22,11 @@ import org.apache.camel.Processor; import org.apache.camel.impl.DefaultConsumer; import org.apache.camel.spring.SpringCamelContext; import org.apache.camel.util.ObjectHelper; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.core.DestinationResolver; /** * A consumer of exchanges for the Spring Integration @@ -38,14 +38,14 @@ import org.springframework.integration.support.channel.ChannelResolver; */ public class SpringIntegrationConsumer extends DefaultConsumer implements MessageHandler { private final SpringCamelContext context; - private final ChannelResolver channelResolver; + private final DestinationResolver<MessageChannel> destinationResolver; private SubscribableChannel inputChannel; private MessageChannel outputChannel; public SpringIntegrationConsumer(SpringIntegrationEndpoint endpoint, Processor processor) { super(endpoint, processor); this.context = (SpringCamelContext) endpoint.getCamelContext(); - this.channelResolver = new BeanFactoryChannelResolver(context.getApplicationContext()); + this.destinationResolver = new BeanFactoryChannelResolver(context.getApplicationContext()); } @Override @@ -68,7 +68,7 @@ public class SpringIntegrationConsumer extends DefaultConsumer implements Messa } ObjectHelper.notEmpty(inputChannelName, "inputChannelName", getEndpoint()); - inputChannel = (SubscribableChannel) channelResolver.resolveChannelName(inputChannelName); + inputChannel = (SubscribableChannel) destinationResolver.resolveDestination(inputChannelName); } else { inputChannel = (SubscribableChannel) getEndpoint().getMessageChannel(); } @@ -81,7 +81,7 @@ public class SpringIntegrationConsumer extends DefaultConsumer implements Messa if (getEndpoint().isInOut()) { // we need to setup right outputChannel for further processing ObjectHelper.notEmpty(getEndpoint().getOutputChannel(), "OutputChannel", getEndpoint()); - outputChannel = channelResolver.resolveChannelName(getEndpoint().getOutputChannel()); + outputChannel = destinationResolver.resolveDestination(getEndpoint().getOutputChannel()); if (outputChannel == null) { throw new IllegalArgumentException("Cannot resolve OutputChannel on " + getEndpoint()); @@ -91,7 +91,7 @@ public class SpringIntegrationConsumer extends DefaultConsumer implements Messa inputChannel.subscribe(this); } - public void handleMessage(org.springframework.integration.Message<?> siInMessage) { + public void handleMessage(org.springframework.messaging.Message<?> siInMessage) { // we received a message from spring integration // wrap that in a Camel Exchange and process it Exchange exchange = getEndpoint().createExchange(getEndpoint().isInOut() ? ExchangePattern.InOut : ExchangePattern.InOnly); @@ -131,7 +131,7 @@ public class SpringIntegrationConsumer extends DefaultConsumer implements Messa } // put the message back the outputChannel if we need - org.springframework.integration.Message<?> siOutMessage = + org.springframework.messaging.Message<?> siOutMessage = SpringIntegrationBinding.storeToSpringIntegrationMessage(exchange.getOut()); // send the message to spring integration http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java index f3f816a..e612a1f 100644 --- a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java +++ b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java @@ -26,7 +26,7 @@ import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; import org.apache.camel.spring.SpringCamelContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; /** * Defines the <a href="http://camel.apache.org/springIntergration.html";>Spring Integration Endpoint</a> http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java index ee03d56..a5463d7 100644 --- a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java +++ b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java @@ -27,20 +27,20 @@ import org.apache.camel.impl.DefaultMessage; * @version */ public class SpringIntegrationMessage extends DefaultMessage { - private org.springframework.integration.Message<?> siMessage; + private org.springframework.messaging.Message<?> siMessage; public SpringIntegrationMessage() { } - public SpringIntegrationMessage(org.springframework.integration.Message<?> message) { + public SpringIntegrationMessage(org.springframework.messaging.Message<?> message) { this.siMessage = message; } - public void setMessage(org.springframework.integration.Message<?> message) { + public void setMessage(org.springframework.messaging.Message<?> message) { this.siMessage = message; } - public org.springframework.integration.Message<?> getMessage() { + public org.springframework.messaging.Message<?> getMessage() { return siMessage; } http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java index ee00594..92d0251 100644 --- a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java +++ b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java @@ -21,13 +21,13 @@ import org.apache.camel.Processor; import org.apache.camel.impl.DefaultProducer; import org.apache.camel.spring.SpringCamelContext; import org.apache.camel.util.ObjectHelper; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.core.DestinationResolver; /** * A producer of exchanges for the Spring Integration @@ -37,13 +37,13 @@ import org.springframework.integration.support.channel.ChannelResolver; * @version */ public class SpringIntegrationProducer extends DefaultProducer implements Processor { - private final ChannelResolver channelResolver; + private final DestinationResolver<MessageChannel> destinationResolver; private DirectChannel inputChannel; private MessageChannel outputChannel; public SpringIntegrationProducer(SpringCamelContext context, SpringIntegrationEndpoint endpoint) { super(endpoint); - this.channelResolver = new BeanFactoryChannelResolver(context.getApplicationContext()); + this.destinationResolver = new BeanFactoryChannelResolver(context.getApplicationContext()); } @Override @@ -62,7 +62,7 @@ public class SpringIntegrationProducer extends DefaultProducer implements Proces } ObjectHelper.notEmpty(outputChannelName, "OutputChannelName", getEndpoint()); - outputChannel = channelResolver.resolveChannelName(outputChannelName); + outputChannel = destinationResolver.resolveDestination(outputChannelName); } else { outputChannel = getEndpoint().getMessageChannel(); } @@ -75,7 +75,7 @@ public class SpringIntegrationProducer extends DefaultProducer implements Proces if (getEndpoint().isInOut()) { // we need to setup right inputChannel for further processing ObjectHelper.notEmpty(getEndpoint().getInputChannel(), "InputChannel", getEndpoint()); - inputChannel = (DirectChannel)channelResolver.resolveChannelName(getEndpoint().getInputChannel()); + inputChannel = (DirectChannel)destinationResolver.resolveDestination(getEndpoint().getInputChannel()); if (inputChannel == null) { throw new IllegalArgumentException("Cannot resolve InputChannel on " + getEndpoint()); @@ -100,7 +100,7 @@ public class SpringIntegrationProducer extends DefaultProducer implements Proces } }); } - org.springframework.integration.Message<?> siOutmessage = SpringIntegrationBinding.createSpringIntegrationMessage(exchange); + org.springframework.messaging.Message<?> siOutmessage = SpringIntegrationBinding.createSpringIntegrationMessage(exchange); // send the message to spring integration log.debug("Sending {} to OutputChannel: {}", siOutmessage, outputChannel); http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java index 98f5a1f..0c86132 100644 --- a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java +++ b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java @@ -27,11 +27,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; /** * A CamelContext will be injected into CameSourceAdapter which will @@ -62,7 +62,7 @@ public class CamelSourceAdapter extends AbstractCamelAdapter implements Initiali protected class ConsumerProcessor implements Processor { public void process(final Exchange exchange) throws Exception { - org.springframework.integration.Message<?> request = SpringIntegrationBinding.createSpringIntegrationMessage(exchange); + org.springframework.messaging.Message<?> request = SpringIntegrationBinding.createSpringIntegrationMessage(exchange); if (exchange.getPattern().isOutCapable()) { exchange.getIn().getHeaders().put(MessageHeaders.REPLY_CHANNEL , replyChannel); http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java index 50b1434..99ca9e8 100644 --- a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java +++ b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java @@ -23,11 +23,11 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.spring.integration.SpringIntegrationBinding; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.DefaultExchange; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.MessageHandler; /** * CamelTargetAdapter will redirect the Spring Integration message to the Camel context. http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java index 28b2921..890ea10 100644 --- a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java +++ b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java @@ -20,9 +20,9 @@ import org.apache.camel.Converter; import org.apache.camel.Endpoint; import org.apache.camel.component.spring.integration.SpringIntegrationEndpoint; import org.apache.camel.component.spring.integration.SpringIntegrationMessage; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.support.GenericMessage; /** * The <a href="http://camel.apache.org/type-converter.html";>Type Converters</a> @@ -45,10 +45,10 @@ public final class SpringIntegrationConverter { } @Converter - public static org.springframework.integration.Message<?> toSpringMessage(final org.apache.camel.Message camelMessage) throws Exception { + public static org.springframework.messaging.Message<?> toSpringMessage(final org.apache.camel.Message camelMessage) throws Exception { if (camelMessage instanceof SpringIntegrationMessage) { SpringIntegrationMessage siMessage = (SpringIntegrationMessage)camelMessage; - org.springframework.integration.Message<?> message = siMessage.getMessage(); + org.springframework.messaging.Message<?> message = siMessage.getMessage(); if (message != null) { return message; } @@ -60,7 +60,7 @@ public final class SpringIntegrationConverter { } @Converter - public static org.apache.camel.Message toCamelMessage(final org.springframework.integration.Message<?> springMessage) throws Exception { + public static org.apache.camel.Message toCamelMessage(final org.springframework.messaging.Message<?> springMessage) throws Exception { return new SpringIntegrationMessage(springMessage); } http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java index 8c77202..6d2a3e7 100644 --- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java +++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java @@ -20,8 +20,8 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.spring.CamelSpringTestSupport; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.support.GenericMessage; public class SpringIntegrationOneWayConsumerTest extends CamelSpringTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java index f183ffd..3fe828a 100644 --- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java +++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java @@ -24,12 +24,12 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.test.spring.CamelSpringTestSupport; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.support.GenericMessage; public class SpringIntegrationTwoWayConsumerTest extends CamelSpringTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java index bfd55da..af5b101 100644 --- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java +++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java @@ -22,9 +22,9 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.test.spring.CamelSpringTestSupport; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; public class CamelSourceAdapterTest extends CamelSpringTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java index 7a98c7e..eed8b05 100644 --- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java +++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java @@ -25,12 +25,12 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.spring.CamelSpringTestSupport; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.support.GenericMessage; public class CamelTargetAdapterTest extends CamelSpringTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 33cf6a1..028dc02 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -467,7 +467,7 @@ <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version> <spring-data-commons-version>1.6.5.RELEASE</spring-data-commons-version> <spring-data-redis-version>1.6.0.RELEASE</spring-data-redis-version> - <spring-integration-version>2.2.6.RELEASE</spring-integration-version> + <spring-integration-version>4.2.2.RELEASE</spring-integration-version> <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version> <spring-ldap-version>2.0.4.RELEASE</spring-ldap-version> <spring-ldap-bundle-version>2.0.3.RELEASE_1</spring-ldap-bundle-version>
