From b44878d0bfe18ae31e6ac1f235e61a3cadd6fa99 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 22 Jan 2010 11:15:58 +0000
Subject: Make domain launchers run from the distribution (TUSCANY-3423)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@902059 13f79535-47bb-0310-9956-ffa450edef68
---
 .../launchers/introducing-domain/build.xml         | 25 ++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'sandbox/travelsample/launchers/introducing-domain/build.xml')

diff --git a/sandbox/travelsample/launchers/introducing-domain/build.xml b/sandbox/travelsample/launchers/introducing-domain/build.xml
index 67d5fab24c..700515a791 100644
--- a/sandbox/travelsample/launchers/introducing-domain/build.xml
+++ b/sandbox/travelsample/launchers/introducing-domain/build.xml
@@ -20,14 +20,35 @@
 <project name="scatours-launcher-introducing-domain" default="run">
     <import file="../../antdefs.xml"/>
 
-    <target name="run" depends="compile">
+    <!-- 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="scatours.IntroducingDomainAPILauncher" fork="true">
+            <classpath>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <fileset dir="${env.TUSCANY_HOME}/modules">
+                    <include name="tuscany-node-launcher-*.jar"/>
+                </fileset>
+            </classpath>
+        </java>
+    </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="target/classes" fork="true">
+              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>
-- 
cgit v1.2.3