Author: davsclaus
Date: Fri Feb 11 14:38:55 2011
New Revision: 1069819
URL: http://svn.apache.org/viewvc?rev=1069819&view=rev
Log:
CAMEL-3630: Upgraded to SI 2.0.3
Modified:
camel/trunk/components/camel-spring-integration/pom.xml
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelSource.xml
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
Modified: camel/trunk/components/camel-spring-integration/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/pom.xml?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/pom.xml (original)
+++ camel/trunk/components/camel-spring-integration/pom.xml Fri Feb 11 14:38:55
2011
@@ -34,8 +34,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
-
<camel.osgi.import.before.defaults>org.springframework.integration.*;version="[1,2)"
- </camel.osgi.import.before.defaults>
+
<camel.osgi.import.before.defaults>org.springframework.integration.*;version="[2,3)"</camel.osgi.import.before.defaults>
</properties>
<dependencies>
Modified:
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java
Fri Feb 11 14:38:55 2011
@@ -32,22 +32,22 @@ public final class SpringIntegrationBind
// Helper class
}
- public static org.springframework.integration.core.Message
createSpringIntegrationMessage(Exchange exchange) {
+ public static org.springframework.integration.Message
createSpringIntegrationMessage(Exchange exchange) {
return createSpringIntegrationMessage(exchange,
exchange.getIn().getHeaders());
}
@SuppressWarnings("unchecked")
- public static org.springframework.integration.core.Message
createSpringIntegrationMessage(Exchange exchange, Map<String, Object> headers) {
+ public static org.springframework.integration.Message
createSpringIntegrationMessage(Exchange exchange, Map<String, Object> headers) {
org.apache.camel.Message message = exchange.getIn();
return new GenericMessage(message.getBody(), headers);
}
@SuppressWarnings("unchecked")
- public static org.springframework.integration.core.Message
storeToSpringIntegrationMessage(org.apache.camel.Message message) {
+ public static org.springframework.integration.Message
storeToSpringIntegrationMessage(org.apache.camel.Message message) {
return new GenericMessage(message.getBody());
}
- public static void
storeToCamelMessage(org.springframework.integration.core.Message siMessage,
org.apache.camel.Message cMessage) {
+ public static void
storeToCamelMessage(org.springframework.integration.Message siMessage,
org.apache.camel.Message cMessage) {
cMessage.setBody(siMessage.getPayload());
cMessage.setHeaders(siMessage.getHeaders());
}
Modified:
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
Fri Feb 11 14:38:55 2011
@@ -21,11 +21,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.channel.BeanFactoryChannelResolver;
-import org.springframework.integration.channel.ChannelResolver;
-import org.springframework.integration.channel.SubscribableChannel;
-import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.message.MessageHandler;
+import org.springframework.integration.MessageChannel;
+import org.springframework.integration.core.MessageHandler;
+import org.springframework.integration.core.SubscribableChannel;
+import
org.springframework.integration.support.channel.BeanFactoryChannelResolver;
+import org.springframework.integration.support.channel.ChannelResolver;
/**
* A consumer of exchanges for the Spring Integration
@@ -90,7 +90,7 @@ public class SpringIntegrationConsumer
inputChannel.subscribe(this);
}
- public void handleMessage(org.springframework.integration.core.Message<?>
siInMessage) {
+ public void handleMessage(org.springframework.integration.Message<?>
siInMessage) {
// we received a message from spring integration
// wrap that in a Camel Exchange and process it
Exchange exchange = getEndpoint().createExchange();
@@ -130,7 +130,7 @@ public class SpringIntegrationConsumer
}
// put the message back the outputChannel if we need
- org.springframework.integration.core.Message siOutMessage =
+ org.springframework.integration.Message siOutMessage =
SpringIntegrationBinding.storeToSpringIntegrationMessage(exchange.getOut());
// send the message to spring integration
Modified:
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
Fri Feb 11 14:38:55 2011
@@ -22,7 +22,7 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spring.SpringCamelContext;
-import org.springframework.integration.core.MessageChannel;
+import org.springframework.integration.MessageChannel;
/**
* Defines the <a
href="http://camel.apache.org/springIntergration.html";>Spring Integration
Endpoint</a>
Modified:
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
Fri Feb 11 14:38:55 2011
@@ -27,20 +27,20 @@ import org.apache.camel.impl.DefaultMess
* @version $Revision$
*/
public class SpringIntegrationMessage extends DefaultMessage {
- private org.springframework.integration.core.Message siMessage;
+ private org.springframework.integration.Message siMessage;
public SpringIntegrationMessage() {
}
- public
SpringIntegrationMessage(org.springframework.integration.core.Message message) {
+ public SpringIntegrationMessage(org.springframework.integration.Message
message) {
this.siMessage = message;
}
- public void setMessage(org.springframework.integration.core.Message
message) {
+ public void setMessage(org.springframework.integration.Message message) {
this.siMessage = message;
}
- public org.springframework.integration.core.Message getMessage() {
+ public org.springframework.integration.Message getMessage() {
return siMessage;
}
Modified:
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
Fri Feb 11 14:38:55 2011
@@ -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.channel.BeanFactoryChannelResolver;
-import org.springframework.integration.channel.ChannelResolver;
+import org.springframework.integration.Message;
+import org.springframework.integration.MessageChannel;
+import org.springframework.integration.MessageHeaders;
import org.springframework.integration.channel.DirectChannel;
-import org.springframework.integration.core.Message;
-import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.core.MessageHeaders;
-import org.springframework.integration.message.MessageHandler;
+import org.springframework.integration.core.MessageHandler;
+import
org.springframework.integration.support.channel.BeanFactoryChannelResolver;
+import org.springframework.integration.support.channel.ChannelResolver;
/**
* A producer of exchanges for the Spring Integration
@@ -94,7 +94,7 @@ public class SpringIntegrationProducer e
// subscribe so we can receive the reply from spring integration
inputChannel.subscribe(new MessageHandler() {
- public void handleMessage(Message<?> message) {
+ public void handleMessage(Message<?> message) {
if (log.isDebugEnabled()) {
log.debug("Received " + message + " from InputChannel:
" + inputChannel);
}
@@ -102,7 +102,7 @@ public class SpringIntegrationProducer e
}
});
}
- org.springframework.integration.core.Message siOutmessage =
SpringIntegrationBinding.createSpringIntegrationMessage(exchange);
+ org.springframework.integration.Message siOutmessage =
SpringIntegrationBinding.createSpringIntegrationMessage(exchange);
// send the message to spring integration
if (log.isDebugEnabled()) {
Modified:
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java
Fri Feb 11 14:38:55 2011
@@ -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.integration.channel.DirectChannel;
-import org.springframework.integration.core.Message;
-import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.core.MessageHeaders;
-import org.springframework.integration.message.MessageHandler;
+import org.springframework.integration.core.MessageHandler;
/**
* A CamelContext will be injected into CameSourceAdapter which will
@@ -62,7 +62,7 @@ public class CamelSourceAdapter extends
protected class ConsumerProcessor implements Processor {
public void process(final Exchange exchange) throws Exception {
- org.springframework.integration.core.Message request =
SpringIntegrationBinding.createSpringIntegrationMessage(exchange);
+ org.springframework.integration.Message request =
SpringIntegrationBinding.createSpringIntegrationMessage(exchange);
if (exchange.getPattern().isOutCapable()) {
exchange.getIn().getHeaders().put(MessageHeaders.REPLY_CHANNEL
, replyChannel);
Modified:
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
Fri Feb 11 14:38:55 2011
@@ -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.core.Message;
-import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.core.MessageHeaders;
-import org.springframework.integration.message.MessageDeliveryException;
-import org.springframework.integration.message.MessageHandler;
+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;
/**
* CamelTargetAdapter will redirect the Spring Integration message to the
Camel context.
Modified:
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java
Fri Feb 11 14:38:55 2011
@@ -20,8 +20,8 @@ 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.core.MessageChannel;
-import org.springframework.integration.core.MessageHeaders;
+import org.springframework.integration.MessageChannel;
+import org.springframework.integration.MessageHeaders;
import org.springframework.integration.message.GenericMessage;
/**
@@ -39,16 +39,16 @@ public final class SpringIntegrationConv
@Converter
public static Endpoint toEndpoint(final MessageChannel channel) throws
Exception {
- Endpoint answer = new
SpringIntegrationEndpoint("spring-integration://" + channel.getName(), channel,
null);
+ Endpoint answer = new
SpringIntegrationEndpoint("spring-integration://" + channel.toString(),
channel, null);
return answer;
}
@SuppressWarnings("unchecked")
@Converter
- public static org.springframework.integration.core.Message
toSpringMessage(final org.apache.camel.Message camelMessage) throws Exception {
+ public static org.springframework.integration.Message
toSpringMessage(final org.apache.camel.Message camelMessage) throws Exception {
if (camelMessage instanceof SpringIntegrationMessage) {
SpringIntegrationMessage siMessage =
(SpringIntegrationMessage)camelMessage;
- org.springframework.integration.core.Message message =
siMessage.getMessage();
+ org.springframework.integration.Message message =
siMessage.getMessage();
if (message != null) {
return message;
}
@@ -60,7 +60,7 @@ public final class SpringIntegrationConv
}
@Converter
- public static org.apache.camel.Message toCamelMessage(final
org.springframework.integration.core.Message springMessage) throws Exception {
+ public static org.apache.camel.Message toCamelMessage(final
org.springframework.integration.Message springMessage) throws Exception {
return new SpringIntegrationMessage(springMessage);
}
Modified:
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java
Fri Feb 11 14:38:55 2011
@@ -20,8 +20,8 @@ import org.apache.camel.component.mock.M
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.message.StringMessage;
+import org.springframework.integration.MessageChannel;
+import org.springframework.integration.message.GenericMessage;
public class SpringIntegrationOneWayConsumerTest extends
CamelSpringTestSupport {
private static final String MESSAGE_BODY = "hello world";
@@ -32,7 +32,7 @@ public class SpringIntegrationOneWayCons
resultEndpoint.expectedBodiesReceived(MESSAGE_BODY);
MessageChannel outputChannel = (MessageChannel)
applicationContext.getBean("outputChannel");
- outputChannel.send(new StringMessage(MESSAGE_BODY));
+ outputChannel.send(new GenericMessage<Object>(MESSAGE_BODY));
resultEndpoint.assertIsSatisfied();
}
Modified:
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
Fri Feb 11 14:38:55 2011
@@ -22,12 +22,12 @@ import java.util.Map;
import org.apache.camel.test.junit4.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.integration.channel.DirectChannel;
-import org.springframework.integration.core.Message;
-import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.core.MessageHeaders;
+import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.message.GenericMessage;
-import org.springframework.integration.message.MessageHandler;
public class SpringIntegrationTwoWayConsumerTest extends
CamelSpringTestSupport {
private static final String MESSAGE_BODY = "Request message";
Modified:
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java
Fri Feb 11 14:38:55 2011
@@ -20,9 +20,9 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.integration.Message;
import org.springframework.integration.channel.DirectChannel;
-import org.springframework.integration.core.Message;
-import org.springframework.integration.message.MessageHandler;
+import org.springframework.integration.core.MessageHandler;
public class CamelSourceAdapterTest extends CamelSpringTestSupport {
@Test
Modified:
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
Fri Feb 11 14:38:55 2011
@@ -23,13 +23,12 @@ import org.apache.camel.component.mock.M
import org.apache.camel.test.junit4.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.integration.channel.DirectChannel;
-import org.springframework.integration.core.Message;
-import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.core.MessageHeaders;
+import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.message.GenericMessage;
-import org.springframework.integration.message.MessageHandler;
-import org.springframework.integration.message.StringMessage;
public class CamelTargetAdapterTest extends CamelSpringTestSupport {
private static final String MESSAGE_BODY = "hello world";
@@ -39,7 +38,7 @@ public class CamelTargetAdapterTest exte
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result",
MockEndpoint.class);
resultEndpoint.expectedBodiesReceived(MESSAGE_BODY);
MessageChannel outputChannel = (MessageChannel)
applicationContext.getBean("channelA");
- outputChannel.send(new StringMessage(MESSAGE_BODY));
+ outputChannel.send(new GenericMessage<Object>(MESSAGE_BODY));
resultEndpoint.assertIsSatisfied();
}
@@ -47,7 +46,7 @@ public class CamelTargetAdapterTest exte
public void testSendingTwoWayMessage() throws Exception {
MessageChannel requestChannel = (MessageChannel)
applicationContext.getBean("channelB");
- Message message = new StringMessage(MESSAGE_BODY);
+ Message message = new GenericMessage(MESSAGE_BODY);
//Need to subscribe the responseChannel first
DirectChannel responseChannel = (DirectChannel)
applicationContext.getBean("channelC");
responseChannel.subscribe(new MessageHandler() {
Modified:
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
Fri Feb 11 14:38:55 2011
@@ -27,15 +27,14 @@ public class ConfigurationTest extends A
@Test
public void testCamelSourceEndpoint() throws Exception {
- context =
- new ClassPathXmlApplicationContext(new String[]
{"/org/apache/camel/component/spring/integration/adapter/CamelSource.xml"});
+ context = new ClassPathXmlApplicationContext(new
String[]{"/org/apache/camel/component/spring/integration/adapter/CamelSource.xml"});
CamelSourceAdapter camelSourceA = (CamelSourceAdapter)
context.getBean("camelSourceA");
assertNotNull(camelSourceA);
- assertEquals("Get the wrong request channel name",
camelSourceA.getChannel().getName(), "channelA");
+ assertEquals("Get the wrong request channel name",
camelSourceA.getChannel().toString(), "channelA");
assertEquals("ExpectReply should be false ",
camelSourceA.isExpectReply(), false);
CamelSourceAdapter camelSourceB = (CamelSourceAdapter)
context.getBean("camelSourceB");
assertNotNull(camelSourceB);
- assertEquals("Get the wrong request channel name",
camelSourceB.getChannel().getName(), "channelB");
+ assertEquals("Get the wrong request channel name",
camelSourceB.getChannel().toString(), "channelB");
assertEquals("ExpectReply should be true ",
camelSourceB.isExpectReply(), true);
context.destroy();
@@ -43,14 +42,13 @@ public class ConfigurationTest extends A
@Test
public void testCamelTragetEndpoint() throws Exception {
- context =
- new ClassPathXmlApplicationContext(new String[]
{"/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml"});
+ context = new ClassPathXmlApplicationContext(new
String[]{"/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml"});
CamelTargetAdapter camelTargetA =
(CamelTargetAdapter)context.getBean("camelTargetA");
assertNotNull(camelTargetA);
assertEquals("Subscript the wrong CamelEndpointUri",
camelTargetA.getCamelEndpointUri(), "direct:EndpointA");
CamelTargetAdapter camelTargetB =
(CamelTargetAdapter)context.getBean("camelTargetB");
assertNotNull(camelTargetB);
- assertEquals("Subscript the wrong reply channel name",
camelTargetB.getReplyChannel().getName(), "channelC");
+ assertEquals("Subscript the wrong reply channel name",
camelTargetB.getReplyChannel().toString(), "channelC");
context.destroy();
}
}
Modified:
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelSource.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelSource.xml?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelSource.xml
(original)
+++
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelSource.xml
Fri Feb 11 14:38:55 2011
@@ -21,7 +21,7 @@
xmlns:camel-si="http://camel.apache.org/schema/spring/integration";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+ http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
http://camel.apache.org/schema/spring/integration
http://camel.apache.org/schema/spring/integration/camel-spring-integration.xsd
">
Modified:
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml
(original)
+++
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml
Fri Feb 11 14:38:55 2011
@@ -24,7 +24,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
-
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+
http://www.springframework.org/schema/integration/spring-integration.xsd
http://camel.apache.org/schema/spring/integration
http://camel.apache.org/schema/spring/integration/camel-spring-integration.xsd
http://camel.apache.org/schema/spring
Modified:
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml
(original)
+++
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml
Fri Feb 11 14:38:55 2011
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
-
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+
http://www.springframework.org/schema/integration/spring-integration.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
Modified:
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml
(original)
+++
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml
Fri Feb 11 14:38:55 2011
@@ -22,7 +22,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
-
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+
http://www.springframework.org/schema/integration/spring-integration.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
Modified:
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml
(original)
+++
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml
Fri Feb 11 14:38:55 2011
@@ -22,7 +22,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
-
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+
http://www.springframework.org/schema/integration/spring-integration.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
Modified:
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
(original)
+++
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
Fri Feb 11 14:38:55 2011
@@ -22,7 +22,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
-
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+
http://www.springframework.org/schema/integration/spring-integration.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Feb 11 14:38:55 2011
@@ -128,7 +128,7 @@
<smack-version>3.1.0</smack-version>
<snmp4j-version>1.8.1_3</snmp4j-version>
<smpp-version>2.1.0_1</smpp-version>
- <spring-integration-version>1.0.4.RELEASE</spring-integration-version>
+ <spring-integration-version>2.0.3.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-version>3.0.5.RELEASE</spring-version>
<spring-osgi-version>1.2.0</spring-osgi-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Fri
Feb 11 14:38:55 2011
@@ -586,7 +586,7 @@
<bundle>mvn:org.apache.camel/camel-soap/${pom.version}</bundle>
</feature>
<feature name='camel-spring-integration' version='${pom.version}'>
-
<bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework.integration/org.springframework.integration/${spring-integration-version}</bundle>
+
<bundle>mvn:org.springframework.integration/spring-integration-core/${spring-integration-version}</bundle>
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:org.apache.camel/camel-spring-integration/${pom.version}</bundle>
</feature>
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java?rev=1069819&r1=1069818&r2=1069819&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
Fri Feb 11 14:38:55 2011
@@ -177,6 +177,4 @@ public abstract class AbstractFeatureTes
return options;
}
-
-
}
