diff options
Diffstat (limited to 'sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-ws-jaxws')
-rw-r--r-- | sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-ws-jaxws/build.xml | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-ws-jaxws/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-ws-jaxws/build.xml index 116f2999ba..a1181373c9 100644 --- a/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-ws-jaxws/build.xml +++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-ws-jaxws/build.xml @@ -34,7 +34,7 @@ <ant dir="../../launchers/currency-converter-ws" target="run"/>
</target>
- <target name="run" depends="is-jdk6, jaxws-jdk6, jaxws-jdk5">
+ <target name="run" depends="locate-jaxws">
<java classname="scatours.CurrencyConverterWSClient" fork="true" failonerror="true">
<classpath>
<pathelement location="target/${ant.project.name}.jar"/>
@@ -42,23 +42,4 @@ </classpath>
</java>
</target>
-
- <!-- check to see if we are running on JDK 6 -->
- <target name="is-jdk6">
- <condition property="jdk6">
- <available classname="javax.xml.ws.Service"/>
- </condition>
- </target>
-
- <!-- JDK 6 contains JAX-WS so we don't need it on the classpath -->
- <target name="jaxws-jdk6" if="jdk6">
- <path id="jaxws-path"/>
- </target>
-
- <!-- on JDK 5 we need to add the JAX-WS runtime to the classpath -->
- <target name="jaxws-jdk5" unless="jdk6">
- <path id="jaxws-path">
- <fileset dir="${env.JAXWS_HOME}/lib"/>
- </path>
- </target>
</project>
|