From b52a2bb551904ead321022e60ab7c55d08eb3d4d Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Wed, 24 Sep 2008 18:51:37 +0000
Subject: [PATCH] Updated the Odd-Even demos to use the new
 'inbound-channel-adapter' element with 'ref' and 'method' attributes instead
 of 'channel-adapter'.

---
 .../integration/samples/oddeven/cronOddEvenDemo.xml   | 11 +++--------
 .../samples/oddeven/intervalOddEvenDemo.xml           | 11 +++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
index 8dc6124963..a0dfca7574 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
@@ -13,9 +13,9 @@
 	<channel id="even"/>
 	<channel id="odd"/>
 
-	<channel-adapter id="numbers" source="counter">
+	<inbound-channel-adapter id="numbers" ref="counter" method="next">
 		<poller cron="1,2,3,5,8,13,21,34,55 * * * * ?" max-messages-per-poll="1"/>
-	</channel-adapter>
+	</inbound-channel-adapter>
 
 	<router ref="parityResolver" method="getParity" input-channel="numbers"/>
 
@@ -23,12 +23,7 @@
 
 	<service-activator ref="evenLogger" input-channel="even"/>
 
-	<beans:bean id="counter" class="org.springframework.integration.message.MethodInvokingSource">
-		<beans:property name="object">
-			<beans:bean class="org.springframework.integration.samples.oddeven.Counter"/>
-		</beans:property>
-		<beans:property name="methodName" value="next"/>
-	</beans:bean>
+	<beans:bean id="counter" class="org.springframework.integration.samples.oddeven.Counter"/>
 
 	<beans:bean id="parityResolver" class="org.springframework.integration.samples.oddeven.ParityResolver"/>
 
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
index afeb4f3569..82eb6ce257 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
@@ -13,9 +13,9 @@
 	<channel id="even"/>
 	<channel id="odd"/>
 
-	<channel-adapter id="numbers" source="counter">
+	<inbound-channel-adapter id="numbers" ref="counter" method="next">
 		<poller period="3000" max-messages-per-poll="1"/>
-	</channel-adapter>
+	</inbound-channel-adapter>
 
 	<router ref="parityResolver" method="getParity" input-channel="numbers"/>
 
@@ -23,12 +23,7 @@
 
 	<service-activator ref="evenLogger" input-channel="even"/>
 
-	<beans:bean id="counter" class="org.springframework.integration.message.MethodInvokingSource">
-		<beans:property name="object">
-			<beans:bean class="org.springframework.integration.samples.oddeven.Counter"/>
-		</beans:property>
-		<beans:property name="methodName" value="next"/>
-	</beans:bean>
+	<beans:bean id="counter" class="org.springframework.integration.samples.oddeven.Counter"/>
 
 	<beans:bean id="parityResolver" class="org.springframework.integration.samples.oddeven.ParityResolver"/>