diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/TickerStream.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/TickerStream.java
index da1787af53..77f58dcf75 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/TickerStream.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/TickerStream.java
@@ -18,18 +18,11 @@ package org.springframework.integration.samples.quote;
 
 import java.util.Random;
 
-import org.springframework.integration.annotation.ChannelAdapter;
-import org.springframework.integration.annotation.MessageEndpoint;
-import org.springframework.integration.annotation.Poller;
-
 /**
  * @author Mark Fisher
  */
-@MessageEndpoint
 public class TickerStream {
 
-	@ChannelAdapter("tickers")
-	@Poller(interval = 300)
 	public String nextTicker() {
 		char[] chars = new char[3];
 		for (int i = 0; i < 3; i++) {
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 85a19f5a98..edccdf0537 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,10 +12,18 @@
 
 	<annotation-config/>
 
-	<beans:bean class="org.springframework.integration.samples.quote.TickerStream"/>
+	<inbound-channel-adapter ref="tickerStream" method="nextTicker" channel="tickers">
+		<poller max-messages-per-poll="1">
+			<interval-trigger interval="300"/>
+		</poller>
+	</inbound-channel-adapter>
 
-	<beans:bean class="org.springframework.integration.samples.quote.QuoteService"/>
+	<channel id="tickers"/>
 
 	<stream:stdout-channel-adapter id="quotes" append-newline="true"/>
 
+	<beans:bean id="tickerStream" class="org.springframework.integration.samples.quote.TickerStream"/>
+
+	<beans:bean id="quoteService" class="org.springframework.integration.samples.quote.QuoteService"/>
+
 </beans:beans>