diff --git a/samples/airline/pom.xml b/samples/airline/pom.xml
index 6552d88a..a41c4b9d 100644
--- a/samples/airline/pom.xml
+++ b/samples/airline/pom.xml
@@ -47,11 +47,6 @@
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-ws-security</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.ws</groupId>
-            <artifactId>spring-ws-sandbox</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <!-- Spring dependencies -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -164,32 +159,11 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>5.0.4</version>
         </dependency>
-        <!-- JMS depdendencies -->
-        <dependency>
-            <groupId>javax.jms</groupId>
-            <artifactId>jms</artifactId>
-            <version>1.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-management</artifactId>
-            <version>1.0-rc4</version>
-        </dependency>
-        <dependency>
-            <groupId>activemq</groupId>
-            <artifactId>activemq</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-            <version>1.3.4</version>
-        </dependency>
         <!-- Various dependencies -->
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>1.2.1</version>
+            <version>1.4</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
diff --git a/samples/airline/src/main/webapp/WEB-INF/web.xml b/samples/airline/src/main/webapp/WEB-INF/web.xml
index 51173c38..38dcdf50 100644
--- a/samples/airline/src/main/webapp/WEB-INF/web.xml
+++ b/samples/airline/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
          version="2.4">
     <display-name>Spring-WS Airline Sample</display-name>
@@ -20,8 +19,6 @@
             classpath:org/springframework/ws/samples/airline/service/applicationContext.xml
             <!-- Remove the following line if you want to disable WS-Security and Acegi -->
             classpath:org/springframework/ws/samples/airline/security/applicationContext-security.xml
-            <!-- Remove the following line if you want to disable JMS support -->
-            classpath:org/springframework/ws/samples/airline/ws/applicationContext-ws-jms.xml
             classpath:org/springframework/ws/samples/airline/ws/applicationContext-ws.xml
         </param-value>
     </context-param>
diff --git a/samples/airline/client/jms/build.xml b/sandbox/jms-client/build.xml
similarity index 100%
rename from samples/airline/client/jms/build.xml
rename to sandbox/jms-client/build.xml
diff --git a/samples/airline/client/jms/readme.txt b/sandbox/jms-client/readme.txt
similarity index 100%
rename from samples/airline/client/jms/readme.txt
rename to sandbox/jms-client/readme.txt
diff --git a/samples/airline/client/jms/src/org/springframework/ws/samples/airline/client/jms/GetFlights.java b/sandbox/jms-client/src/org/springframework/ws/samples/airline/client/jms/GetFlights.java
similarity index 100%
rename from samples/airline/client/jms/src/org/springframework/ws/samples/airline/client/jms/GetFlights.java
rename to sandbox/jms-client/src/org/springframework/ws/samples/airline/client/jms/GetFlights.java
diff --git a/samples/airline/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws-jms.xml b/sandbox/src/main/resources/org/springframework/ws/transport/jms/applicationContext-ws-jms.xml
similarity index 100%
rename from samples/airline/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws-jms.xml
rename to sandbox/src/main/resources/org/springframework/ws/transport/jms/applicationContext-ws-jms.xml
diff --git a/sandbox/src/test/java/org/springframework/ws/transport/jms/MessageEndpointMessageListenerTest.java b/sandbox/src/test/java/org/springframework/ws/transport/jms/MessageEndpointMessageListenerTest.java
index c7b2ab49..8c16e84f 100644
--- a/sandbox/src/test/java/org/springframework/ws/transport/jms/MessageEndpointMessageListenerTest.java
+++ b/sandbox/src/test/java/org/springframework/ws/transport/jms/MessageEndpointMessageListenerTest.java
@@ -77,7 +77,7 @@ public class MessageEndpointMessageListenerTest extends TestCase {
             public void invoke(MessageContext messageContext) throws Exception {
             }
         };
-        messageListener.setMessageEndpoint(endpoint);
+        messageListener.setMessageReceiver(endpoint);
 
         request.reset();
         messageListener.onMessage(request, sessionMock);
@@ -104,7 +104,7 @@ public class MessageEndpointMessageListenerTest extends TestCase {
                 messageContext.getResponse();
             }
         };
-        messageListener.setMessageEndpoint(endpoint);
+        messageListener.setMessageReceiver(endpoint);
 
         messageListener.onMessage(request, sessionMock);