diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/ChannelAdaptersDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/ChannelAdapterDemo.java
similarity index 95%
rename from org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/ChannelAdaptersDemo.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/ChannelAdapterDemo.java
index 4c2acce658..10c6f8a44c 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/ChannelAdaptersDemo.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/ChannelAdapterDemo.java
@@ -23,7 +23,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
  * 
  * @author Mark Fisher
  */
-public class ChannelAdaptersDemo {
+public class ChannelAdapterDemo {
 
 	private final static String[] configFiles = {
 		"common.xml", "inboundChannelAdapter.xml", "outboundChannelAdapter.xml"
@@ -31,7 +31,7 @@ public class ChannelAdaptersDemo {
 
 
 	public static void main(String[] args) {
-		new ClassPathXmlApplicationContext(configFiles, ChannelAdaptersDemo.class);
+		new ClassPathXmlApplicationContext(configFiles, ChannelAdapterDemo.class);
 	}
 
 }
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/DemoBean.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/DemoBean.java
new file mode 100644
index 0000000000..0e7794f7ee
--- /dev/null
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/DemoBean.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2002-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.samples.jms;
+
+import org.springframework.integration.annotation.MessageEndpoint;
+import org.springframework.integration.annotation.ServiceActivator;
+
+/**
+ * @author Mark Fisher
+ */
+@MessageEndpoint
+public class DemoBean {
+
+	@ServiceActivator
+	public String upperCase(String input) {
+		return input.toUpperCase();
+	}
+
+}
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/GatewayDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/GatewayDemo.java
new file mode 100644
index 0000000000..e0e7ba94c1
--- /dev/null
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/GatewayDemo.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2002-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.samples.jms;
+
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * Bootstrap for starting the JMS Gateways.
+ * 
+ * @author Mark Fisher
+ */
+public class GatewayDemo {
+
+	private final static String[] configFiles = {
+		"common.xml", "inboundGateway.xml", "outboundGateway.xml"
+	};
+
+
+	public static void main(String[] args) {
+		new ClassPathXmlApplicationContext(configFiles, GatewayDemo.class);
+	}
+
+}
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml
new file mode 100644
index 0000000000..7d4b25f9e6
--- /dev/null
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:jms="http://www.springframework.org/schema/integration/jms"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/context
+			http://www.springframework.org/schema/context/spring-context-2.5.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/jms
+			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd
+			http://www.springframework.org/schema/integration/stream
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
+
+	<context:component-scan base-package="org.springframework.integration.samples.jms"/>
+
+	<jms:inbound-gateway id="jmsin" destination="demoQueue" request-channel="demoChannel"/>
+
+	<channel id="demoChannel"/>
+
+	<service-activator input-channel="demoChannel" ref="demoBean"/>
+
+</beans:beans>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml
new file mode 100644
index 0000000000..3a7c295556
--- /dev/null
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:jms="http://www.springframework.org/schema/integration/jms"
+	xmlns:stream="http://www.springframework.org/schema/integration/stream"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/context
+			http://www.springframework.org/schema/context/spring-context-2.5.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/jms
+			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd
+			http://www.springframework.org/schema/integration/stream
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
+
+	<stream:stdin-channel-adapter id="stdin" channel="stdinToJmsoutChannel"/>
+
+	<channel id="stdinToJmsoutChannel"/>
+
+	<beans:bean class="org.springframework.integration.endpoint.SubscribingConsumerEndpoint">
+		<beans:constructor-arg ref="jmsOutGateway"/>
+		<beans:constructor-arg ref="stdinToJmsoutChannel"/>
+	</beans:bean>
+	<beans:bean id="jmsOutGateway" class="org.springframework.integration.jms.JmsOutboundGateway">
+		<beans:property name="jmsTemplate">
+			<beans:bean class="org.springframework.jms.core.JmsTemplate">
+				<beans:property name="connectionFactory" ref="connectionFactory"/>
+			</beans:bean>
+		</beans:property>
+		<beans:property name="jmsQueue" ref="demoQueue"/>
+		<beans:property name="outputChannel" ref="jmsReplyToStdoutChannel"/>
+	</beans:bean>
+
+	<channel id="jmsReplyToStdoutChannel"/>
+
+	<stream:stdout-channel-adapter channel="jmsReplyToStdoutChannel" append-newline="true"/>
+
+</beans:beans>