From 767861d727a7666fdcecf1e3cf01691a2afd5c7b Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Fri, 26 Feb 2010 09:19:26 +0000
Subject: [PATCH] Reworked echo sample to use maven for clients

---
 samples/echo/client/saaj/build.xml      | 57 -------------------------
 samples/echo/client/saaj/readme.txt     | 10 -----
 samples/echo/client/spring-ws/build.xml | 46 --------------------
 samples/echo/readme.txt                 |  8 +++-
 4 files changed, 6 insertions(+), 115 deletions(-)
 delete mode 100644 samples/echo/client/saaj/build.xml
 delete mode 100644 samples/echo/client/saaj/readme.txt
 delete mode 100644 samples/echo/client/spring-ws/build.xml

diff --git a/samples/echo/client/saaj/build.xml b/samples/echo/client/saaj/build.xml
deleted file mode 100644
index 6162e75f..00000000
--- a/samples/echo/client/saaj/build.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="spring-ws-airline-sample-saaj-client" default="build" xmlns:artifact="urn:maven-artifact-ant">
-    <property name="bin.dir" value="bin"/>
-    <property name="src.dir" value="src"/>
-
-    <target name="init">
-        <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
-            <classpath>
-                <pathelement location="${basedir}/../../../maven-ant-tasks-2.0.7.jar"/>
-            </classpath>
-        </typedef>
-
-        <artifact:remoteRepository id="main" url="http://repo1.maven.org/maven2/"/>
-        <artifact:remoteRepository id="java.net" url="http://download.java.net/maven/1/"
-                                   layout="legacy"/>
-        <artifact:remoteRepository id="spring-ext"
-            url="https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/"/>
-
-        <artifact:dependencies pathId="compile.classpath">
-            <remoteRepository refid="main"/>
-            <remoteRepository refid="java.net" />
-            <remoteRepository refid="spring-ext" />
-            <dependency groupId="javax.xml.soap" artifactId="saaj-api" version="1.3"/>
-        </artifact:dependencies>
-
-        <artifact:dependencies pathId="runtime.classpath">
-            <remoteRepository refid="main"/>
-            <remoteRepository refid="java.net" />
-            <remoteRepository refid="spring-ext" />
-            <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
-        </artifact:dependencies>
-
-    </target>
-
-    <target name="build" depends="init">
-        <mkdir dir="${bin.dir}"/>
-        <javac srcdir="${src.dir}" destdir="${bin.dir}" debug="true">
-            <classpath refid="compile.classpath"/>
-        </javac>
-    </target>
-
-    <target name="clean">
-        <delete dir="${bin.dir}"/>
-    </target>
-
-    <target name="run" depends="echo"/>
-
-    <target name="echo" depends="build">
-        <java classname="org.springframework.ws.samples.echo.client.saaj.EchoClient" fork="true" failonerror="true">
-            <classpath refid="compile.classpath" />
-            <classpath refid="runtime.classpath" />
-            <classpath location="${bin.dir}"/>
-        </java>
-    </target>
-
-</project>
diff --git a/samples/echo/client/saaj/readme.txt b/samples/echo/client/saaj/readme.txt
deleted file mode 100644
index 65b438fe..00000000
--- a/samples/echo/client/saaj/readme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-SPRING WEB SERVICES
-
-This directory contains a Java clients for the Echo Web Service that uses SAAJ: SOAP with Attachments API for Java. It
-creates a SOAP message for the 'echo' operation, and sends it using SAAJ. This client does not use Spring-WS in any way.
-
-SAAJ Client Sample table of contents
----------------------------------------------------
-* src - The source files for the client
-* build.xml -  Ant build file with a 'build' and a 'run' target
-
diff --git a/samples/echo/client/spring-ws/build.xml b/samples/echo/client/spring-ws/build.xml
deleted file mode 100644
index 91ed2e40..00000000
--- a/samples/echo/client/spring-ws/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<project name="spring-ws-echo-sample-spring-ws-client" default="build" xmlns:artifact="urn:maven-artifact-ant">
-    <property name="bin.dir" value="bin"/>
-    <property name="src.dir" value="src"/>
-
-    <target name="init">
-        <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
-            <classpath>
-                <pathelement location="${basedir}/../../../maven-ant-tasks-2.0.7.jar"/>
-            </classpath>
-        </typedef>
-
-        <artifact:dependencies pathId="classpath">
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="2.0.0-M1"/>
-            <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>
-
-    </target>
-
-    <target name="build" depends="init">
-        <mkdir dir="${bin.dir}"/>
-        <javac srcdir="${src.dir}" destdir="${bin.dir}">
-            <classpath refid="classpath"/>
-        </javac>
-        <copy todir="${bin.dir}">
-            <fileset dir="${src.dir}">
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="clean">
-        <delete dir="${bin.dir}"/>
-    </target>
-
-    <target name="run" depends="echo"/>
-
-    <target name="echo" depends="build">
-        <java classname="org.springframework.ws.samples.echo.client.sws.EchoClient" fork="true" failonerror="true">
-            <classpath refid="classpath"/>
-            <classpath location="${bin.dir}"/>
-        </java>
-    </target>
-
-</project>
diff --git a/samples/echo/readme.txt b/samples/echo/readme.txt
index 90bb264a..72d2f55f 100644
--- a/samples/echo/readme.txt
+++ b/samples/echo/readme.txt
@@ -8,8 +8,12 @@
 This sample shows a bare-bones echoing service. Incoming messages are handled
 via DOM, and a simple 'business logic' service is used to obtain the result.
 
-2. INSTALLATION
+2. SERVER
 
-Simply run "mvn package" and deploy the war file generated in target/.
+Simply run "mvn package" in the server directory and deploy the war file generated in 'target'.
 Alternatively, run "mvn jetty:run" to run the sample in a built-in Jetty6 Web
 container.
+
+3. CLIENT
+
+Simply run "mvn install exec:java" in each of the client subdirectories.