Add/fix ant scripts for contents of travel sample services and launchers directories (TUSCANY-3398)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@895152 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 12 insertions, 22 deletions

diff --git a/sandbox/travelsample/launchers/currency-converter-jms/build.xml b/sandbox/travelsample/launchers/currency-converter-jms/build.xml
index d5db4633a3..264e028dd1 100644
--- a/sandbox/travelsample/launchers/currency-converter-jms/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-jms/build.xml
@@ -18,23 +18,20 @@
 -->

 

 <project name="scatours-launcher-currency-converter-jms" default="compile">

-    <property environment="env"/> 

-

-    <target name="compile">

-        <mkdir dir="target/classes"/>

-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">

-            <src path="src/main/java"/>

-            <classpath>

-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac>

-    </target>

+    <import file="../../antdefs.xml"/>

+    <path id="compile-path">

+        <pathelement path="../common/target/scatours-launcher-common.jar"/>

+    </path>

+    <path id="package-path" refid="compile-path"/>

 

+    <!-- Before invoking the "run" target, the JMS broker needs to be

+         started and running in a different process. -->

     <target name="run-broker">

         <java classname="scatours.JMSBrokerLauncher" fork="true">

             <classpath>

-                <pathelement location="target/classes"/>

-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

+                <pathelement location="target/${ant.project.name}.jar"/>

+                <!-- The following is used to bring in the ActiveMQ runtime. -->

+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </java>

     </target>

@@ -42,16 +39,9 @@
     <target name="run">

         <java classname="scatours.CurrencyConverterJMSLauncher" fork="true">

             <classpath>

-                <pathelement location="target/classes"/>

-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

+                <pathelement location="target/${ant.project.name}.jar"/>

+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </java>

     </target>

-

-    <target name="clean">

-        <delete includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-

 </project>