Author: ningjiang
Date: Thu Dec 4 01:27:41 2008
New Revision: 723264
URL: http://svn.apache.org/viewvc?rev=723264&view=rev
Log:
CAMEL-1143 upgraded the Spring Integration to 1.0 GA
Modified:
activemq/camel/trunk/components/camel-spring-integration/pom.xml
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/adapter/CamelTarget.xml
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.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=723264&r1=723263&r2=723264&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring-integration/pom.xml Thu Dec 4
01:27:41 2008
@@ -33,7 +33,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
- <spring-integration-version>1.0.0.RC1</spring-integration-version>
+ <spring-integration-version>1.0.0.RELEASE</spring-integration-version>
</properties>
<repositories>
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=723264&r1=723263&r2=723264&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
Thu Dec 4 01:27:41 2008
@@ -31,8 +31,6 @@
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
- <message-bus/>
-
<channel id="channelA"/>
<channel id="channelB"/>
<channel id="channelC"/>
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml?rev=723264&r1=723263&r2=723264&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml
Thu Dec 4 01:27:41 2008
@@ -31,8 +31,7 @@
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!-- END SNIPPET: header -->
- <message-bus/>
-
+
<outbound-channel-adapter id="channelA" ref="camelTargetA"/>
<outbound-channel-adapter id="channelB" ref="camelTargetB"/>
<channel id="channelC"/>
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml?rev=723264&r1=723263&r2=723264&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml
Thu Dec 4 01:27:41 2008
@@ -24,9 +24,7 @@
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd";>
-
- <message-bus/>
-
+
<channel id="outputChannel"/>
<camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
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=723264&r1=723263&r2=723264&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
Thu Dec 4 01:27:41 2008
@@ -25,8 +25,7 @@
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd";>
-
- <message-bus/>
+
<channel id="inputChannel"/>
<channel id="outputChannel"/>
<channel id="onewayChannel"/>
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml?rev=723264&r1=723263&r2=723264&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml
Thu Dec 4 01:27:41 2008
@@ -26,9 +26,7 @@
http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd";>
<!-- START SNIPPET: example -->
- <message-bus/>
-
- <channel id="outputChannel"/>
+ <channel id="outputChannel"/>
<camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
<route>
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml?rev=723264&r1=723263&r2=723264&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
Thu Dec 4 01:27:41 2008
@@ -25,9 +25,7 @@
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd";>
- <!-- START SNIPPET: example -->
- <message-bus/>
-
+ <!-- START SNIPPET: example -->
<channel id="requestChannel"/>
<channel id="responseChannel"/>
