From b8a70f14c7ba4b36de1ef3be58ce99f7f820aaee Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Thu, 20 Mar 2008 12:32:01 +0000
Subject: [PATCH] Fixed build for JAX-WS airline client

---
 samples/airline/client/jax-ws/build.xml | 30 +++++++++----------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/samples/airline/client/jax-ws/build.xml b/samples/airline/client/jax-ws/build.xml
index dce61844..30082584 100644
--- a/samples/airline/client/jax-ws/build.xml
+++ b/samples/airline/client/jax-ws/build.xml
@@ -14,39 +14,30 @@
         </typedef>
 
         <artifact:remoteRepository id="main" url="http://repo1.maven.org/maven2/"/>
-        <artifact:remoteRepository id="java.net" url="https://maven-repository.dev.java.net/nonav/repository"
+        <artifact:remoteRepository id="java.net.1" url="https://maven-repository.dev.java.net/nonav/repository"
                                    layout="legacy"/>
+        <artifact:remoteRepository id="java.net.2" url="http://download.java.net/maven/2/"/>
 
-        <artifact:dependencies pathId="generate.classpath">
-            <remoteRepository refid="java.net"/>
-            <dependency groupId="com.sun.xml.ws" artifactId="jaxws-tools" version="2.1.2"/>
-            <dependency groupId="org.jvnet.staxex" artifactId="stax-ex" version="1.0"/>
-        </artifact:dependencies>
-
-        <artifact:dependencies pathId="compile.classpath">
+        <artifact:dependencies pathId="classpath">
             <remoteRepository refid="main"/>
-            <remoteRepository refid="java.net"/>
-            <dependency groupId="javax.xml.ws" artifactId="jaxws-api" version="2.1"/>
-        </artifact:dependencies>
-
-        <artifact:dependencies pathId="runtime.classpath">
-            <remoteRepository refid="main"/>
-            <remoteRepository refid="java.net"/>
-            <dependency groupId="com.sun.xml.ws" artifactId="jaxws-rt" version="2.1.2"/>
+            <remoteRepository refid="java.net.1"/>
+            <remoteRepository refid="java.net.2"/>
+            <dependency groupId="com.sun.xml.ws" artifactId="jaxws-rt" version="2.1.3"/>
+            <dependency groupId="com.sun.xml.ws" artifactId="jaxws-tools" version="2.1.3"/>
             <dependency groupId="org.jvnet.staxex" artifactId="stax-ex" version="1.0"/>
         </artifact:dependencies>
 
     </target>
 
     <target name="generate" depends="init">
-        <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport" classpathref="generate.classpath"/>
+        <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport" classpathref="classpath"/>
         <wsimport wsdl="http://localhost:8080/airline/airline.wsdl" destdir="${bin.dir}"
                   package="org.springframework.ws.samples.airline.client.jaxws"/>
     </target>
 
     <target name="build" depends="generate">
         <javac srcdir="${src.dir}" destdir="${bin.dir}" debug="true">
-            <classpath refid="compile.classpath"/>
+            <classpath refid="classpath"/>
             <classpath location="${bin.dir}"/>
         </javac>
     </target>
@@ -57,8 +48,7 @@
 
     <target name="run" depends="build">
         <java classname="org.springframework.ws.samples.airline.client.jaxws.Main" fork="true" failonerror="true">
-            <classpath refid="compile.classpath"/>
-            <classpath refid="runtime.classpath"/>
+            <classpath refid="classpath"/>
             <classpath location="${bin.dir}"/>
         </java>
     </target>