Author: ningjiang
Date: Thu Dec 4 01:32:20 2008
New Revision: 723265
URL: http://svn.apache.org/viewvc?rev=723265&view=rev
Log:
Merged revisions 723264 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r723264 | ningjiang | 2008-12-04 17:27:41 +0800 (Thu, 04 Dec 2008) | 1 line
CAMEL-1143 upgraded the Spring Integration to 1.0 GA
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java
(props changed)
activemq/camel/branches/camel-1.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java
(props changed)
activemq/camel/branches/camel-1.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java
(props changed)
activemq/camel/branches/camel-1.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java
(props changed)
activemq/camel/branches/camel-1.x/components/camel-spring-integration/pom.xml
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelSource.xml
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 4 01:32:20 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Propchange:
activemq/camel/branches/camel-1.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 4 01:32:20 2008
@@ -1 +1 @@
-/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java:722878
+/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java:722878,723264
Propchange:
activemq/camel/branches/camel-1.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 4 01:32:20 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java:723264
Propchange:
activemq/camel/branches/camel-1.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 4 01:32:20 2008
@@ -1 +1 @@
-/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java:722878
+/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java:722878,723264
Propchange:
activemq/camel/branches/camel-1.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 4 01:32:20 2008
@@ -1 +1 @@
-/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java:722878
+/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java:722878,723264
Modified:
activemq/camel/branches/camel-1.x/components/camel-spring-integration/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-spring-integration/pom.xml?rev=723265&r1=723264&r2=723265&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-spring-integration/pom.xml
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-spring-integration/pom.xml
Thu Dec 4 01:32:20 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.RC1</spring-integration-version>
+ <spring-integration-version>1.0.0.RELEASE</spring-integration-version>
</properties>
<version>1.5.1-SNAPSHOT</version>
Modified:
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelSource.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelSource.xml?rev=723265&r1=723264&r2=723265&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelSource.xml
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelSource.xml
Thu Dec 4 01:32:20 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/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml?rev=723265&r1=723264&r2=723265&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml
Thu Dec 4 01:32:20 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/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml?rev=723265&r1=723264&r2=723265&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml
Thu Dec 4 01:32:20 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/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml?rev=723265&r1=723264&r2=723265&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml
Thu Dec 4 01:32:20 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/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml?rev=723265&r1=723264&r2=723265&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml
Thu Dec 4 01:32:20 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/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml?rev=723265&r1=723264&r2=723265&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
Thu Dec 4 01:32:20 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"/>
