From ec8fdd98c8863a7f67523fa0f1683daab68374a8 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 8 May 2010 14:41:14 +0000
Subject: Add a tuscany.home property to make it easy to run the ant script
 from outside a distribution, e.g. from eclipse

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@942392 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-java-2.x/trunk/samples/calculator-equinox/build.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'sca-java-2.x/trunk')

diff --git a/sca-java-2.x/trunk/samples/calculator-equinox/build.xml b/sca-java-2.x/trunk/samples/calculator-equinox/build.xml
index f67c2502b5..9fd79a3fba 100644
--- a/sca-java-2.x/trunk/samples/calculator-equinox/build.xml
+++ b/sca-java-2.x/trunk/samples/calculator-equinox/build.xml
@@ -17,8 +17,12 @@
  * under the License.    
 -->
 <project name="calculator-equinox" default="run">
+	<property name="tuscany.home" value="../.."/>
 	<property name="sample.name" value="${ant.project.name}"/>
 	<property name="sample.jar" value="./target/sample-${sample.name}.jar" />
+	
+	<echo>${java.home}</echo>
+	<echo>${tuscany.home}</echo>
 
 	<target name="init">
 		<mkdir dir="target/classes"/>
@@ -31,7 +35,7 @@
                source="1.5"
                target="1.5">
 			<classpath>
-				<fileset dir="../../features">
+				<fileset dir="${tuscany.home}/features">
 					<include name="tuscany-sca-manifest.jar" />
 				</fileset>
 			</classpath>
@@ -44,7 +48,7 @@
 	</target>
 
 	<target name="run" depends="compile">
-		<java jar="../../features/tuscany-sca-manifest.jar" fork="true" failonerror="true">
+		<java jar="${tuscany.home}/features/tuscany-sca-manifest.jar" fork="true" failonerror="true">
 			<jvmarg value="-Djava.util.logging.config.file=../logging.properties"/>
 			<!-- optional to set the deployable composite -->
 			<arg value="-composite"/>
@@ -57,12 +61,12 @@
 	</target>
 
 	<target name="run-equinox" depends="compile">
-		<java jar="../../features/tuscany-sca-equinox-manifest.jar" fork="true" failonerror="true">
+		<java jar="${tuscany.home}/features/tuscany-sca-equinox-manifest.jar" fork="true" failonerror="true">
 			<jvmarg value="-Djava.util.logging.config.file=../logging.properties"/>
 			<arg value="-composite"/>
 			<arg value="Calculator.composite"/>
 			<arg value="-config"/>
-			<arg value="../../features/configuration"/>
+			<arg value="${tuscany.home}/features/configuration"/>
 			<arg value="-ttl"/>
 			<arg value="0"/>
 			<arg value="${sample.jar}"/>
-- 
cgit v1.2.3