diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/Cafe.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
index 590da1f950..548d9ee11c 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
@@ -16,18 +16,21 @@
 
 package org.springframework.integration.samples.cafe;
 
+import org.springframework.integration.annotation.Gateway;
+
 /**
  * The entry point for Cafe Demo. The demo's main() method invokes the
  * '<code>placeOrder</code>' method on a generated MessagingGateway proxy.
  * The gateway then passes the {@link Order} as the payload of a
  * {@link org.springframework.integration.message.Message} to the
- * configured <em>requestChannel</em>. The channel reference ('orders')
- * is configured in the 'cafeDemo.xml' file.
+ * configured <em>requestChannel</em>. The channel ('orders') is
+ * defined in the 'cafeDemo.xml' file.
  * 
  * @author Mark Fisher
  */
 public interface Cafe {
 
+	@Gateway(requestChannel="orders")
 	void placeOrder(Order order);
 
 }
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
index aaed429cac..1c6efec330 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
@@ -18,9 +18,7 @@
 
 	<context:component-scan base-package="org.springframework.integration.samples.cafe.annotation"/>
 
-	<gateway id="cafe"
-			 service-interface="org.springframework.integration.samples.cafe.Cafe"
-	 		 default-request-channel="orders" />
+	<gateway id="cafe" service-interface="org.springframework.integration.samples.cafe.Cafe"/>
 
 	<channel id="orders"/>
 	<channel id="drinks"/>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
index d786cdd93e..5ea6223f2e 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
@@ -12,9 +12,7 @@
 
 	<message-bus/>
 
-	<gateway id="cafe"
-			 service-interface="org.springframework.integration.samples.cafe.Cafe"
-			 default-request-channel="orders"/>
+	<gateway id="cafe" service-interface="org.springframework.integration.samples.cafe.Cafe"/>
 
 	<channel id="orders"/>
 	<splitter input-channel="orders" ref="orderSplitter" method="split" output-channel="drinks"/>