From 0e51169a217bf8471c818d1cdbc6476f4c43ec7d Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Wed, 15 Aug 2007 23:51:32 +0000
Subject: [PATCH] Increased the version number to 1.0 SNAPSHOT.

---
 samples/airline/client/spring-ws/build.xml    |  2 +-
 samples/airline/pom.xml                       |  2 +-
 .../src/main/webapp/WEB-INF/ws-servlet.xml    |  1 -
 samples/echo/client/spring-ws/build.xml       |  2 +-
 samples/echo/pom.xml                          | 37 ++++++++++++++++++-
 samples/echo/src/main/webapp/WEB-INF/web.xml  |  4 --
 samples/echo/src/main/webapp/index.html       | 14 -------
 samples/mtom/client/jaxws/build.xml           |  5 ---
 samples/mtom/pom.xml                          |  2 +-
 samples/pom.xml                               |  6 ++-
 samples/tutorial/pom.xml                      |  2 +-
 11 files changed, 45 insertions(+), 32 deletions(-)
 delete mode 100755 samples/echo/src/main/webapp/index.html

diff --git a/samples/airline/client/spring-ws/build.xml b/samples/airline/client/spring-ws/build.xml
index fb91f8b8..da3590f2 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-rc3-SNAPSHOT"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.0-SNAPSHOT"/>
             <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 2a97e0eb..f4432ffc 100644
--- a/samples/airline/pom.xml
+++ b/samples/airline/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>spring-ws-samples</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>1.0-rc3-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>airline</artifactId>
diff --git a/samples/airline/src/main/webapp/WEB-INF/ws-servlet.xml b/samples/airline/src/main/webapp/WEB-INF/ws-servlet.xml
index 5b96e8df..9bd3dcd4 100644
--- a/samples/airline/src/main/webapp/WEB-INF/ws-servlet.xml
+++ b/samples/airline/src/main/webapp/WEB-INF/ws-servlet.xml
@@ -42,7 +42,6 @@
         <description>
             The JAXB 2 Marshaller is used by the endpoints.
         </description>
-        <property name="mtomEnabled" value="false"/>
         <property name="contextPath" value="org.springframework.ws.samples.airline.schema"/>
     </bean>
 
diff --git a/samples/echo/client/spring-ws/build.xml b/samples/echo/client/spring-ws/build.xml
index a90c09e6..a3d83380 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-rc3-SNAPSHOT"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.0-SNAPSHOT"/>
             <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 3bc6910b..16def2f7 100644
--- a/samples/echo/pom.xml
+++ b/samples/echo/pom.xml
@@ -1,8 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <artifactId>spring-ws-samples</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>1.0-rc3-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>echo</artifactId>
@@ -32,5 +34,36 @@
             <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>
+            <version>2.8.1</version>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>2.7.0</version>
+        </dependency>
+
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/samples/echo/src/main/webapp/WEB-INF/web.xml b/samples/echo/src/main/webapp/WEB-INF/web.xml
index 7d2e2626..52cc4fc5 100755
--- a/samples/echo/src/main/webapp/WEB-INF/web.xml
+++ b/samples/echo/src/main/webapp/WEB-INF/web.xml
@@ -27,8 +27,4 @@
         <url-pattern>/*</url-pattern>
     </servlet-mapping>
 
-    <welcome-file-list>
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
-
 </web-app>
\ No newline at end of file
diff --git a/samples/echo/src/main/webapp/index.html b/samples/echo/src/main/webapp/index.html
deleted file mode 100755
index e1fb4f6f..00000000
--- a/samples/echo/src/main/webapp/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Author" content="Ingo Siebert">
-   <title>Spring WS test page</title>
-</head>
-<body bgcolor="#FFFFFF">
-<h1>Spring-WS Echo</h1>
-If you see this page, the WAR deployment was successful.
-</body>
-</html>
-
diff --git a/samples/mtom/client/jaxws/build.xml b/samples/mtom/client/jaxws/build.xml
index 2197535b..2960ddb1 100644
--- a/samples/mtom/client/jaxws/build.xml
+++ b/samples/mtom/client/jaxws/build.xml
@@ -16,12 +16,9 @@
 
         <artifact:remoteRepository id="java.net" url="https://maven-repository.dev.java.net/nonav/repository"
                                    layout="legacy"/>
-        <artifact:remoteRepository id="spring-ext"
-                                   url="https://svn.sourceforge.net/svnroot/springframework/repos/repo-ext/"/>
 
         <artifact:dependencies pathId="generate.classpath">
             <remoteRepository refid="java.net"/>
-            <remoteRepository refid="spring-ext"/>
             <dependency groupId="com.sun.xml.ws" artifactId="jaxws-tools" version="EA3"/>
             <dependency groupId="com.sun.xml.bind" artifactId="jaxb-xjc" version="2.1-EA2"/>
             <dependency groupId="com.sun.xml.stream.buffer" artifactId="streambuffer" version="0.3"/>
@@ -32,14 +29,12 @@
 
         <artifact:dependencies pathId="compile.classpath">
             <remoteRepository refid="java.net"/>
-            <remoteRepository refid="spring-ext"/>
             <dependency groupId="javax.xml.ws" artifactId="jaxws-api" version="2.1-SNAPSHOT"/>
             <dependency groupId="org.springframework" artifactId="spring-core" version="2.0.5"/>
         </artifact:dependencies>
 
         <artifact:dependencies pathId="runtime.classpath">
             <remoteRepository refid="java.net"/>
-            <remoteRepository refid="spring-ext"/>
             <dependency groupId="com.sun.xml.ws" artifactId="jaxws-rt" version="EA3"/>
             <dependency groupId="com.sun.xml.bind" artifactId="jaxb-impl" version="2.1-EA2"/>
             <dependency groupId="com.sun.xml.bind" artifactId="jaxb-xjc" version="2.1-EA2"/>
diff --git a/samples/mtom/pom.xml b/samples/mtom/pom.xml
index dc2f1ad7..8aed5ca7 100644
--- a/samples/mtom/pom.xml
+++ b/samples/mtom/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <artifactId>spring-ws-samples</artifactId>
       <groupId>org.springframework.ws</groupId>
-      <version>1.0-rc3-SNAPSHOT</version>
+      <version>1.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>mtom</artifactId>
diff --git a/samples/pom.xml b/samples/pom.xml
index d7d75fed..7f4ab5a6 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-ws</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>1.0-rc3-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-ws-samples</artifactId>
@@ -20,6 +20,8 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
+                                <version>6.1.4</version>
+
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -39,6 +41,7 @@
         </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>
@@ -59,5 +62,6 @@
             <artifactId>saaj-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
+        -->
     </dependencies>
 </project>
diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml
index a4584ed6..dda03d28 100644
--- a/samples/tutorial/pom.xml
+++ b/samples/tutorial/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-ws-samples</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>1.0-rc3-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tutorial</artifactId>