From d5ba9d4d5102c9c13bb5a403bfd5a3d8aa7044e4 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Fri, 17 Aug 2007 21:57:20 +0000
Subject: [PATCH] Backported changes from 1.0.0

---
 .../resources/archetype-resources/pom.xml     |  4 ++--
 samples/airline/client/saaj/build.xml         |  7 ++++++-
 samples/airline/client/spring-ws/build.xml    |  2 +-
 samples/airline/pom.xml                       |  8 +++++++-
 samples/echo/client/spring-ws/build.xml       |  2 +-
 samples/echo/pom.xml                          | 20 -------------------
 samples/pom.xml                               |  2 --
 7 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml
index 40b79d44..718f2c03 100644
--- a/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/pom.xml
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-oxm</artifactId>
-            <version>1.0-rc2</version>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-ws-core</artifactId>
-            <version>1.0-rc2</version>
+            <version>1.0.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/samples/airline/client/saaj/build.xml b/samples/airline/client/saaj/build.xml
index 4010e929..ab0af57b 100644
--- a/samples/airline/client/saaj/build.xml
+++ b/samples/airline/client/saaj/build.xml
@@ -21,7 +21,12 @@
             <remoteRepository refid="java.net"/>
             <remoteRepository refid="spring-ext"/>
             <dependency groupId="javax.xml.soap" artifactId="saaj-api" version="1.3"/>
-            <dependency groupId="com.sun.xml.wss" artifactId="xws-security" version="2.0-ea2"/>
+            <dependency groupId="com.sun.xml.wss" artifactId="xws-security" version="2.0-FCS">
+                <exclusion groupId="javax.xml.parsers" artifactId="jaxp-api"/>
+                <exclusion groupId="javax.xml.bind" artifactId="jaxb-api"/>
+                <exclusion groupId="javax.xml.ws" artifactId="jaxws-api"/>
+                <exclusion groupId="javax.xml" artifactId="jaxrpc-api"/>
+            </dependency>
             <dependency groupId="com.sun.org.apache.xml.security" artifactId="xmlsec" version="2.0"/>
         </artifact:dependencies>
 
diff --git a/samples/airline/client/spring-ws/build.xml b/samples/airline/client/spring-ws/build.xml
index da3590f2..813f7580 100644
--- a/samples/airline/client/spring-ws/build.xml
+++ b/samples/airline/client/spring-ws/build.xml
@@ -14,7 +14,7 @@
         </typedef>
 
         <artifact:dependencies pathId="classpath">
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.0-SNAPSHOT"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.0.0"/>
             <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
             <dependency groupId="commons-httpclient" artifactId="commons-httpclient" version="3.0.1"/>
             <dependency groupId="commons-httpclient" artifactId="commons-httpclient" version="3.0.1"/>
diff --git a/samples/airline/pom.xml b/samples/airline/pom.xml
index 4f8891da..97c0ef5e 100644
--- a/samples/airline/pom.xml
+++ b/samples/airline/pom.xml
@@ -9,10 +9,16 @@
     <packaging>war</packaging>
     <name>Spring WS Airline Sample</name>
     <repositories>
+        <repository>
+            <id>java.net</id>
+            <name>Java.net Repository for Maven2</name>
+            <url>http://download.java.net/maven/1/</url>
+            <layout>legacy</layout>
+        </repository>
         <repository>
             <id>spring-ext</id>
             <name>Spring External Dependencies Repository</name>
-            <url>https://svn.sourceforge.net/svnroot/springframework/repos/repo-ext/</url>
+            <url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/</url>
         </repository>
     </repositories>
     <reporting>
diff --git a/samples/echo/client/spring-ws/build.xml b/samples/echo/client/spring-ws/build.xml
index a3d83380..94a6409d 100644
--- a/samples/echo/client/spring-ws/build.xml
+++ b/samples/echo/client/spring-ws/build.xml
@@ -12,7 +12,7 @@
         </typedef>
 
         <artifact:dependencies pathId="classpath">
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.0-SNAPSHOT"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.0.0"/>
             <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
             <dependency groupId="commons-httpclient" artifactId="commons-httpclient" version="3.0.1"/>
         </artifact:dependencies>
diff --git a/samples/echo/pom.xml b/samples/echo/pom.xml
index 6ab314c9..86c632df 100644
--- a/samples/echo/pom.xml
+++ b/samples/echo/pom.xml
@@ -32,26 +32,6 @@
             <version>1.2_Java1.3</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.axis</groupId>
-            <artifactId>axis-saaj</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis</groupId>
-            <artifactId>axis</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis</groupId>
-            <artifactId>axis-jaxrpc</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-    <groupId>commons-discovery</groupId>
-    <artifactId>commons-discovery</artifactId>
-    <version>0.4</version>
-</dependency>
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
diff --git a/samples/pom.xml b/samples/pom.xml
index 5caf3f72..f20e5100 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -41,7 +41,6 @@
         </dependency>
         <!-- The following JEE dependencies can be changed from 'runtime' to 'provided' if you're running the samples on a full-fledged J2EE application
         server. They are required for running the samples on a Web container such as Tomcat -->
-        <!--
         <dependency>
             <groupId>javax.xml.soap</groupId>
             <artifactId>saaj-api</artifactId>
@@ -62,6 +61,5 @@
             <artifactId>saaj-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
-        -->
     </dependencies>
 </project>