Author: ningjiang
Date: Tue Jul 15 19:43:28 2008
New Revision: 677135
URL: http://svn.apache.org/viewvc?rev=677135&view=rev
Log:
CAMEL-724 upgrade to spring integration M5
Modified:
activemq/camel/trunk/components/camel-spring-integration/pom.xml
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/config/CamelTargetAdapterParser.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java
activemq/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelSource.xml
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml
Modified: activemq/camel/trunk/components/camel-spring-integration/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/pom.xml?rev=677135&r1=677134&r2=677135&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring-integration/pom.xml Tue Jul 15
19:43:28 2008
@@ -13,7 +13,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
- <spring-integration-version>1.0.0.M4</spring-integration-version>
+ <spring-integration-version>1.0.0.M5</spring-integration-version>
</properties>
<version>1.4-SNAPSHOT</version>
@@ -96,11 +96,23 @@
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
+ <artifactId>org.springframework.aop</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
+ <artifactId>org.springframework.beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.transaction</artifactId>
</exclusion>
</exclusions>
</dependency>
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/config/CamelTargetAdapterParser.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/config/CamelTargetAdapterParser.java?rev=677135&r1=677134&r2=677135&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/config/CamelTargetAdapterParser.java
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/config/CamelTargetAdapterParser.java
Tue Jul 15 19:43:28 2008
@@ -28,7 +28,6 @@
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.ConfigurationException;
import org.springframework.integration.endpoint.HandlerEndpoint;
-import org.springframework.integration.scheduling.Subscription;
import org.springframework.util.StringUtils;
/**
@@ -78,8 +77,7 @@
String adapterBeanName =
parserContext.getReaderContext().generateBeanName(adapterDefBuilder.getBeanDefinition());
parserContext.registerBeanComponent(new
BeanComponentDefinition(adapterDefBuilder.getBeanDefinition(),
adapterBeanName));
builder.addConstructorArgReference(adapterBeanName);
- Subscription subscription = new Subscription(requestChannel);
- builder.addPropertyValue("subscription", subscription);
+ builder.addPropertyValue("inputChannelName", requestChannel);
if (StringUtils.hasText(replyChannel)) {
builder.addPropertyValue("outputChannelName", replyChannel);
}
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java?rev=677135&r1=677134&r2=677135&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java
Tue Jul 15 19:43:28 2008
@@ -23,8 +23,8 @@
import org.apache.camel.component.spring.integration.SpringIntegrationEndpoint;
import org.apache.camel.component.spring.integration.SpringIntegrationMessage;
import org.springframework.integration.channel.MessageChannel;
+import org.springframework.integration.message.DefaultMessageHeader;
import org.springframework.integration.message.GenericMessage;
-import org.springframework.integration.message.MessageHeader;
/**
* The <a href="http://activemq.apache.org/camel/type-converter.html";>Type
Converters</a>
@@ -67,7 +67,7 @@
}
// Create a new spring message and copy the attributes and body from
the camel message
- MessageHeader messageHeader = new MessageHeader();
+ DefaultMessageHeader messageHeader = new DefaultMessageHeader();
Map<String, Object> headers = camelMessage.getHeaders();
for (String key : headers.keySet()) {
Object value = headers.get(key);
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java?rev=677135&r1=677134&r2=677135&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
Tue Jul 15 19:43:28 2008
@@ -17,7 +17,6 @@
package org.apache.camel.component.spring.integration.adapter;
import junit.framework.TestCase;
-import org.springframework.context.ApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.endpoint.HandlerEndpoint;
@@ -46,10 +45,10 @@
new ClassPathXmlApplicationContext(new String[]
{"/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml"});
HandlerEndpoint handlerEndpointA =
(HandlerEndpoint)context.getBean("camelTargetA");
assertNotNull(handlerEndpointA);
- assertEquals("Subscript the wrong channel name",
handlerEndpointA.getSubscription().getChannelName(), "channelA");
+ assertEquals("Subscript the wrong channel name",
handlerEndpointA.getInputChannelName(), "channelA");
HandlerEndpoint handlerEndpointB =
(HandlerEndpoint)context.getBean("camelTargetA");
assertNotNull(handlerEndpointB);
- assertEquals("Subscript the wrong channel name",
handlerEndpointB.getSubscription().getChannelName(), "channelA");
+ assertEquals("Subscript the wrong channel name",
handlerEndpointB.getInputChannelName(), "channelA");
context.destroy();
}
}
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelSource.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelSource.xml?rev=677135&r1=677134&r2=677135&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelSource.xml
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelSource.xml
Tue Jul 15 19:43:28 2008
@@ -39,7 +39,7 @@
<handler-endpoint input-channel="channelB"
output-channel="channelC"
- handler="helloService"
+ ref="helloService"
method="sayHello"/>
<beans:bean id="helloService"
class="org.apache.camel.component.spring.integration.HelloWorldService"/>
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml?rev=677135&r1=677134&r2=677135&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml
Tue Jul 15 19:43:28 2008
@@ -30,7 +30,7 @@
<handler-endpoint input-channel="inputChannel"
output-channel="outputChannel"
- handler="helloService"
+ ref="helloService"
method="sayHello"/>
<beans:bean id="helloService"
class="org.apache.camel.component.spring.integration.HelloWorldService"/>
