From b6915886e351b8814c8e54df3eff9d76cb9a0d1d Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Mon, 20 Dec 2010 10:38:49 +0000
Subject: [PATCH] Upgrade samples & archetype to new namespace

---
 .../main/webapp/WEB-INF/spring-ws-servlet.xml   |  9 +++++++--
 .../main/webapp/WEB-INF/spring-ws-servlet.xml   | 17 +++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/spring-ws-servlet.xml
index acafa3ae..703fd433 100644
--- a/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/spring-ws-servlet.xml
+++ b/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/spring-ws-servlet.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" 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.0.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sws="http://www.springframework.org/schema/web-services"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+       http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
+
+    <sws:annotation-driven/>
 
 
 </beans>
\ No newline at end of file
diff --git a/samples/tutorial/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/samples/tutorial/src/main/webapp/WEB-INF/spring-ws-servlet.xml
index 452848b7..b0848520 100644
--- a/samples/tutorial/src/main/webapp/WEB-INF/spring-ws-servlet.xml
+++ b/samples/tutorial/src/main/webapp/WEB-INF/spring-ws-servlet.xml
@@ -17,21 +17,18 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:sws="http://www.springframework.org/schema/web-services"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+       http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd
        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
     <context:component-scan base-package="com.mycompany.hr"/>
 
-    <bean id="holiday" class="org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition">
-        <property name="schema" ref="schema"/>
-        <property name="portTypeName" value="HumanResource"/>
-        <!-- we use a relative uri that will be transformed by spring-ws dep-->
-        <property name="locationUri" value="/holidayService/"/>
-        <property name="targetNamespace" value="http://mycompany.com/hr/definitions"/>
-    </bean>
+    <sws:annotation-driven/>
 
-    <bean id="schema" class="org.springframework.xml.xsd.SimpleXsdSchema">
-        <property name="xsd" value="/WEB-INF/hr.xsd"/>
-    </bean>
+    <sws:dynamic-wsdl id="holiday" portTypeName="HumanResource" locationUri="/holidayService/"
+                      targetNamespace="http://mycompany.com/hr/definitions">
+        <sws:xsd location="/WEB-INF/hr.xsd"/>
+    </sws:dynamic-wsdl>
 
 </beans>