From f1b728c6e8e60a146051d5563c61fb333f0941f9 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Thu, 17 Apr 2008 09:42:08 +0000
Subject: [PATCH] SWS-334

---
 parent/pom.xml                                |  2 +-
 .../airline/jms/applicationContext-jms.xml    | 28 +++++++++++++++++++
 .../airline/ws/applicationContext-ws.xml      | 23 ---------------
 .../airline/src/main/webapp/WEB-INF/web.xml   |  1 +
 4 files changed, 30 insertions(+), 24 deletions(-)
 create mode 100644 samples/airline/src/main/resources/org/springframework/ws/samples/airline/jms/applicationContext-jms.xml

diff --git a/parent/pom.xml b/parent/pom.xml
index de2ea815..6767537e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
         <url>http://fisheye3.cenqua.com/browse/springframework/spring-ws/trunk</url>
     </scm>
     <properties>
-        <spring.version>2.5.2</spring.version>
+        <spring.version>2.5.3</spring.version>
     </properties>
     <repositories>
         <repository>
diff --git a/samples/airline/src/main/resources/org/springframework/ws/samples/airline/jms/applicationContext-jms.xml b/samples/airline/src/main/resources/org/springframework/ws/samples/airline/jms/applicationContext-jms.xml
new file mode 100644
index 00000000..b94a5a24
--- /dev/null
+++ b/samples/airline/src/main/resources/org/springframework/ws/samples/airline/jms/applicationContext-jms.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:jms="http://www.springframework.org/schema/jms"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-2.5.xsd">
+
+    <!-- ===================== JMS TRANSPORT  ===================================== -->
+
+    <bean id="broker" class="org.apache.activemq.broker.BrokerFactory" factory-method="createBroker"
+          init-method="start">
+        <constructor-arg value="broker:tcp://localhost:61616?persistent=false"/>
+    </bean>
+
+    <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+        <property name="brokerURL" value="tcp://localhost:61616"/>
+    </bean>
+
+    <jms:listener-container connection-factory="connectionFactory">
+        <jms:listener destination="RequestQueue" ref="messageListener"/>
+    </jms:listener-container>
+
+    <bean id="messageListener" class="org.springframework.ws.transport.jms.WebServiceMessageListener">
+        <property name="messageFactory" ref="messageFactory"/>
+        <property name="messageReceiver" ref="messageReceiver"/>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/samples/airline/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml b/samples/airline/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml
index b40cdc27..45cc547e 100644
--- a/samples/airline/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml
+++ b/samples/airline/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml
@@ -161,27 +161,4 @@
         <property name="order" value="2"/>
     </bean>
 
-
-    <!-- ===================== JMS TRANSPORT  ===================================== -->
-
-    <bean id="broker" class="org.apache.activemq.broker.BrokerFactory" factory-method="createBroker"
-          init-method="start">
-        <constructor-arg value="broker:tcp://localhost:61616?persistent=false"/>
-    </bean>
-
-    <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
-        <property name="brokerURL" value="tcp://localhost:61616"/>
-    </bean>
-
-    <bean class="org.springframework.jms.listener.DefaultMessageListenerContainer">
-        <property name="connectionFactory" ref="connectionFactory"/>
-        <property name="destinationName" value="RequestQueue"/>
-        <property name="messageListener">
-            <bean class="org.springframework.ws.transport.jms.WebServiceMessageListener">
-                <property name="messageFactory" ref="messageFactory"/>
-                <property name="messageReceiver" ref="messageReceiver"/>
-            </bean>
-        </property>
-    </bean>
-
 </beans>
diff --git a/samples/airline/src/main/webapp/WEB-INF/web.xml b/samples/airline/src/main/webapp/WEB-INF/web.xml
index 62cebc46..4194a264 100644
--- a/samples/airline/src/main/webapp/WEB-INF/web.xml
+++ b/samples/airline/src/main/webapp/WEB-INF/web.xml
@@ -12,6 +12,7 @@
             classpath:org/springframework/ws/samples/airline/service/applicationContext.xml
             classpath:org/springframework/ws/samples/airline/security/applicationContext-security.xml
             classpath:org/springframework/ws/samples/airline/ws/applicationContext-ws.xml
+            classpath:org/springframework/ws/samples/airline/jms/applicationContext-jms.xml
         </param-value>
     </context-param>
     <listener>