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

4 files changed, 37 insertions, 62 deletions

diff --git a/sandbox/travelsample/launchers/fullapp-domain/build.xml b/sandbox/travelsample/launchers/fullapp-domain/build.xml
index 92957b88ab..1befc6413f 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/build.xml
+++ b/sandbox/travelsample/launchers/fullapp-domain/build.xml
@@ -18,20 +18,37 @@
 -->

 

 <project name="scatours-launcher-fullapp-domain" default="run">

-    <property environment="env"/> 

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

 

+    <!-- In Tuscany 1.5.1 the command-line launcher for the domain manager

+       is hard wired to use the current directory for the domain configuration,

+       so we use a custom launcher to override this setting using the domain

+       manager API.  Note that the classpath only includes the node launcher

+       jar which will bootstrap the rest of the Tuscany runtime. -->

     <target name="run">

-        <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"

-              dir="." fork="true">

+        <java classname="scatours.FullAppDomainLauncher" fork="true">

             <classpath>

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

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

+                <fileset dir="${env.TUSCANY_HOME}/modules">

+                    <include name="tuscany-node-launcher-*.jar"/>

+                </fileset>

             </classpath>

-        	<arg value="./target/classes"/>

         </java>

     </target>

 

-    <target name="clean">

-        <delete dir="./target"/>

+    <!-- The "run-command" target runs the DomainManagerLauncher class

+       directly (as if it had been invoked from a command line) and passes

+       in the domain configuration directory as a command-line argument.

+       This only works for Tuscany versions greater than 1.5.1. -->

+    <target name="run-command">

+        <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"

+              dir="." fork="true">

+            <classpath>

+                <fileset dir="${env.TUSCANY_HOME}/modules">

+                    <include name="tuscany-node-launcher-*.jar"/>

+                </fileset>

+            </classpath>

+        	<arg value=".\target\classes"/>

+        </java>

     </target>

-

 </project>

diff --git a/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java b/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java
index 8dfbc947c8..21b0ae4cb3 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java
@@ -39,5 +39,6 @@ public class FullAppDomainLauncher {
         } catch (IOException e) {
         }
 
+        dm.getClass().getMethod("stop").invoke(dm);
     }
 }
diff --git a/sandbox/travelsample/launchers/fullapp-nodes/build.xml b/sandbox/travelsample/launchers/fullapp-nodes/build.xml
index c34d22faad..14a483b564 100644
--- a/sandbox/travelsample/launchers/fullapp-nodes/build.xml
+++ b/sandbox/travelsample/launchers/fullapp-nodes/build.xml
@@ -17,37 +17,15 @@
  * under the License.
 -->
 
-<project name="scatours-launcher-fullapp-nodes" default="run">
-    <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>
-        <jar destfile="target/scatours-launcher-fullapp-nodes.jar" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="scatours.FullAppNodesLauncher"/>
-            </manifest>
-        </jar>
-    </target>
+<project name="scatours-launcher-fullapp-nodes" default="compile">
+    <import file="../../antdefs.xml"/>
 
     <target name="run">
         <java classname="scatours.FullAppNodesLauncher" 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>
diff --git a/sandbox/travelsample/launchers/fullapp/build.xml b/sandbox/travelsample/launchers/fullapp/build.xml
index 8061df32e3..d6e7e18dbb 100644
--- a/sandbox/travelsample/launchers/fullapp/build.xml
+++ b/sandbox/travelsample/launchers/fullapp/build.xml
@@ -18,39 +18,18 @@
 -->
 
 <project name="scatours-launcher-fullapp" 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>
-        <copy todir="target/classes">
-            <fileset dir="src\main\resources"/>
-        </copy>
-        <jar destfile="target/scatours-launcher-fullapp.jar" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="scatours.FullAppLauncher"/>
-            </manifest>
-        </jar>
-    </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"/>
 
     <target name="run">
         <java classname="scatours.FullAppLauncher" 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>