From cfac0141223995eb025ab33bab45a4d430d9fbdc Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Sat, 2 Aug 2008 00:19:42 +0000
Subject: [PATCH] Updated channel-adapter configuration in quoteDemo and
 temperatureConversion.xml (WS demo) after the channel-adapter refactoring
 (The <channel-adapter/> element no longer accepts a "channel" reference.
 Instead, it creates a channel itself).

---
 .../springframework/integration/samples/quote/quoteDemo.xml    | 3 +--
 .../integration/samples/ws/temperatureConversion.xml           | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
index 6e781ed822..1abd1ad39f 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
@@ -12,13 +12,12 @@
 	<annotation-driven/>
 
 	<channel id="tickers"/>
-	<channel id="quotes"/>
 
 	<beans:bean class="org.springframework.integration.samples.quote.TickerStream"/>
 
 	<beans:bean class="org.springframework.integration.samples.quote.QuoteService"/>
 
-	<channel-adapter channel="quotes" target="stdout"/>
+	<channel-adapter id="quotes" target="stdout"/>
 
 	<console-target id="stdout" append-newline="true"/>
 
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
index c44886aad2..ed698c4749 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
@@ -10,7 +10,6 @@
 	<message-bus/>
 
 	<channel id="fahrenheitChannel"/>
-	<channel id="celsiusChannel"/>
 
 	<!-- The service activator receives from the 'fahrenheitChannel',
 	     invokes the handler, and sends the reply Message to the 'celsiusChannel'. -->
@@ -23,7 +22,7 @@
 				uri="http://www.w3schools.com/webservices/tempconvert.asmx"/>
 
 	<!-- The response from the service is logged to the console. -->
-	<channel-adapter channel="celsiusChannel" target="console"/>
+	<channel-adapter id="celsiusChannel" target="console"/>
 
 	<console-target id="console"/>