summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--java/sca/itest/samples/build.xml19
-rw-r--r--java/sca/samples/binding-ws-calculator/build.xml3
-rw-r--r--java/sca/samples/calculator-rmi-reference/build.xml3
-rw-r--r--java/sca/samples/calculator-rmi-service/build.xml5
-rw-r--r--java/sca/samples/implementation-java-calculator/build.xml2
5 files changed, 11 insertions, 21 deletions
diff --git a/java/sca/itest/samples/build.xml b/java/sca/itest/samples/build.xml
index 124a30636c..6f2f52f906 100644
--- a/java/sca/itest/samples/build.xml
+++ b/java/sca/itest/samples/build.xml
@@ -27,23 +27,26 @@
we may need to run two samples together to provide reference and
service sides of the sample.
-->
+
+ <property name="distro.root" value="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir/tuscany-sca-2.0-SNAPSHOT" />
+
<target name="run">
<property name="time.to.live" id="ttl" value="4000" />
- <ant antfile="../../samples/implementation-java-calculator/build.xml"
- dir="../../samples/implementation-java-calculator"/>
+ <ant antfile="build.xml"
+ dir="${distro.root}/samples/implementation-java-calculator"/>
- <ant antfile="../../samples/binding-ws-calculator/build.xml"
- dir="../../samples/binding-ws-calculator"/>
+ <ant antfile="build.xml"
+ dir="${distro.root}/samples/binding-ws-calculator"/>
<parallel>
- <ant antfile="../../samples/calculator-rmi-service/build.xml"
- dir="../../samples/calculator-rmi-service"/>
+ <ant antfile="build.xml"
+ dir="${distro.root}/samples/calculator-rmi-service"/>
<sequential>
<sleep seconds="2"/>
- <ant antfile="../../samples/calculator-rmi-reference/build.xml"
- dir="../../samples/calculator-rmi-reference"/>
+ <ant antfile="build.xml"
+ dir="${distro.root}/samples/calculator-rmi-reference"/>
</sequential>
</parallel>
diff --git a/java/sca/samples/binding-ws-calculator/build.xml b/java/sca/samples/binding-ws-calculator/build.xml
index 55544a5af7..0fbec23ea4 100644
--- a/java/sca/samples/binding-ws-calculator/build.xml
+++ b/java/sca/samples/binding-ws-calculator/build.xml
@@ -38,8 +38,6 @@
<classpath>
<pathelement location="../../modules/tuscany-sca-api-2.0-SNAPSHOT.jar"/>
<pathelement location="../../modules/tuscany-node-api-2.0-SNAPSHOT.jar"/>
- <pathelement location="../../modules/sca-api/target/tuscany-sca-api-2.0-SNAPSHOT.jar"/>
- <pathelement location="../../modules/node-api/target/tuscany-node-api-2.0-SNAPSHOT.jar"/>
</classpath>
</javac>
<copy todir="target/classes">
@@ -59,7 +57,6 @@
failonerror="true">
<jvmarg value="-Djava.util.logging.config.file=${sample.root}/../../logging.properties"/>
<classpath>
- <pathelement location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir/tuscany-sca-2.0-SNAPSHOT/bin/launcher.jar"/>
<pathelement location="../../bin/launcher.jar"/>
</classpath>
<arg value="unmanaged"/>
diff --git a/java/sca/samples/calculator-rmi-reference/build.xml b/java/sca/samples/calculator-rmi-reference/build.xml
index 7db1f55aac..f4fe184455 100644
--- a/java/sca/samples/calculator-rmi-reference/build.xml
+++ b/java/sca/samples/calculator-rmi-reference/build.xml
@@ -39,8 +39,6 @@
<classpath>
<pathelement location="../../modules/tuscany-sca-api-2.0-SNAPSHOT.jar"/>
<pathelement location="../../modules/tuscany-node-api-2.0-SNAPSHOT.jar"/>
- <pathelement location="../../modules/sca-api/target/tuscany-sca-api-2.0-SNAPSHOT.jar"/>
- <pathelement location="../../modules/node-api/target/tuscany-node-api-2.0-SNAPSHOT.jar"/>
</classpath>
</javac>
<copy todir="target/classes">
@@ -59,7 +57,6 @@
failonerror="true">
<jvmarg value="-Djava.util.logging.config.file=${sample.root}/../../logging.properties"/>
<classpath>
- <pathelement location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir/tuscany-sca-2.0-SNAPSHOT/bin/launcher.jar"/>
<pathelement location="../../bin/launcher.jar"/>
</classpath>
<arg value="unmanaged"/>
diff --git a/java/sca/samples/calculator-rmi-service/build.xml b/java/sca/samples/calculator-rmi-service/build.xml
index 31fed2b026..d930b57a1a 100644
--- a/java/sca/samples/calculator-rmi-service/build.xml
+++ b/java/sca/samples/calculator-rmi-service/build.xml
@@ -40,8 +40,6 @@
<classpath>
<pathelement location="../../modules/tuscany-sca-api-2.0-SNAPSHOT.jar"/>
<pathelement location="../../modules/tuscany-node-api-2.0-SNAPSHOT.jar"/>
- <pathelement location="../../modules/sca-api/target/tuscany-sca-api-2.0-SNAPSHOT.jar"/>
- <pathelement location="../../modules/node-api/target/tuscany-node-api-2.0-SNAPSHOT.jar"/>
</classpath>
</javac>
<copy todir="target/classes">
@@ -61,7 +59,6 @@
failonerror="true">
<jvmarg value="-Djava.util.logging.config.file=${sample.root}/../../logging.properties"/>
<classpath>
- <pathelement location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT/tuscany-sca-2.0-SNAPSHOT/bin/launcher.jar"/>
<pathelement location="../../bin/launcher.jar"/>
</classpath>
<arg value="target/${jar.name}"/>
@@ -76,8 +73,6 @@
<classpath>
<pathelement location="../../modules/tuscany-node-launcher-2.0-SNAPSHOT.jar"/>
<pathelement location="../../modules/commons-cli-1.1/commons-cli-1.1.jar"/>
- <pathelement location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir/tuscany-sca-2.0-SNAPSHOT/modules/tuscany-node-launcher-2.0-SNAPSHOT.jar"/>
- <pathelement location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir/tuscany-sca-2.0-SNAPSHOT/modules/commons-cli-1.1/commons-cli-1.1.jar"/>
</classpath>
<arg value="target/${jar.name}"/>
<arg value="-t"/>
diff --git a/java/sca/samples/implementation-java-calculator/build.xml b/java/sca/samples/implementation-java-calculator/build.xml
index 9d5557a470..e8e24e4dcb 100644
--- a/java/sca/samples/implementation-java-calculator/build.xml
+++ b/java/sca/samples/implementation-java-calculator/build.xml
@@ -37,7 +37,6 @@
failonerror="true">
<classpath>
<pathelement location="../../modules/tuscany-sca-api-2.0-SNAPSHOT.jar"/>
- <pathelement location="../../modules/sca-api/target/tuscany-sca-api-2.0-SNAPSHOT.jar"/>
</classpath>
</javac>
<copy todir="target/classes">
@@ -53,7 +52,6 @@
failonerror="true">
<jvmarg value="-Djava.util.logging.config.file=${sample.root}/../../logging.properties"/>
<classpath>
- <pathelement location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir/tuscany-sca-2.0-SNAPSHOT/bin/launcher.jar"/>
<pathelement location="../../bin/launcher.jar"/>
</classpath>
<arg value="target/${jar.name}"/>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-03 11:56:13 +0000