diff options
Diffstat (limited to 'sandbox')
13 files changed, 38 insertions, 24 deletions
diff --git a/sandbox/ant/sca/branches/foo/itest/distribution/bin-distro-unzip/build.xml b/sandbox/ant/sca/branches/foo/itest/distribution/bin-distro-unzip/build.xml index dbd7f16c88..7542fc23dd 100644 --- a/sandbox/ant/sca/branches/foo/itest/distribution/bin-distro-unzip/build.xml +++ b/sandbox/ant/sca/branches/foo/itest/distribution/bin-distro-unzip/build.xml @@ -18,7 +18,7 @@ -->
<project name="itest-unzip" default="unzip">
<target name="unzip">
- <unzip src="../../../distribution/all/target/apache-tuscany-sca-all-2.0-M2-SNAPSHOT.zip"
- dest="../../../distribution/all/target/apache-tuscany-sca-all-2.0-M2-SNAPSHOT-dir"/>
+ <unzip src="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.zip"
+ dest="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-dir"/>
</target>
</project>
diff --git a/sandbox/ant/sca/branches/foo/itest/distribution/bin-distro-unzip/pom.xml b/sandbox/ant/sca/branches/foo/itest/distribution/bin-distro-unzip/pom.xml index b59f59d531..1887d5ddc6 100644 --- a/sandbox/ant/sca/branches/foo/itest/distribution/bin-distro-unzip/pom.xml +++ b/sandbox/ant/sca/branches/foo/itest/distribution/bin-distro-unzip/pom.xml @@ -122,6 +122,7 @@ <configuration>
<tasks>
<property name="java.home" value="${java.home}" />
+ <property name="tuscany.version" value="${version}" />
<ant antfile="./build.xml" />
</tasks>
</configuration>
diff --git a/sandbox/ant/sca/branches/foo/itest/distribution/binding-ws-calculator/build.xml b/sandbox/ant/sca/branches/foo/itest/distribution/binding-ws-calculator/build.xml index 15326c4d13..bfcdfe1063 100644 --- a/sandbox/ant/sca/branches/foo/itest/distribution/binding-ws-calculator/build.xml +++ b/sandbox/ant/sca/branches/foo/itest/distribution/binding-ws-calculator/build.xml @@ -28,7 +28,7 @@ service sides of the sample.
-->
- <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-2.0-M2-SNAPSHOT-dir/tuscany-sca-2.0-M2-SNAPSHOT" />
+ <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-dir/tuscany-sca-${tuscany.version}" />
<target name="run">
diff --git a/sandbox/ant/sca/branches/foo/itest/distribution/binding-ws-calculator/pom.xml b/sandbox/ant/sca/branches/foo/itest/distribution/binding-ws-calculator/pom.xml index 028a66aa26..3abdc98222 100644 --- a/sandbox/ant/sca/branches/foo/itest/distribution/binding-ws-calculator/pom.xml +++ b/sandbox/ant/sca/branches/foo/itest/distribution/binding-ws-calculator/pom.xml @@ -69,6 +69,7 @@ </goals>
<configuration>
<tasks>
+ <property name="tuscany.version" value="${version}" />
<ant antfile="./build.xml" target="run" />
</tasks>
</configuration>
diff --git a/sandbox/ant/sca/branches/foo/itest/distribution/calculator-rmi/build.xml b/sandbox/ant/sca/branches/foo/itest/distribution/calculator-rmi/build.xml index c42c999a02..fb6f20f9c1 100644 --- a/sandbox/ant/sca/branches/foo/itest/distribution/calculator-rmi/build.xml +++ b/sandbox/ant/sca/branches/foo/itest/distribution/calculator-rmi/build.xml @@ -27,7 +27,7 @@ service sides of the sample.
-->
- <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-2.0-M2-SNAPSHOT-dir/tuscany-sca-2.0-M2-SNAPSHOT" />
+ <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-dir/tuscany-sca-${tuscany.version}" />
<target name="run">
diff --git a/sandbox/ant/sca/branches/foo/itest/distribution/calculator-rmi/pom.xml b/sandbox/ant/sca/branches/foo/itest/distribution/calculator-rmi/pom.xml index bd47cd77d4..7e49a03d67 100644 --- a/sandbox/ant/sca/branches/foo/itest/distribution/calculator-rmi/pom.xml +++ b/sandbox/ant/sca/branches/foo/itest/distribution/calculator-rmi/pom.xml @@ -69,6 +69,7 @@ </goals>
<configuration>
<tasks>
+ <property name="tuscany.version" value="${version}" />
<ant antfile="./build.xml" target="run" />
</tasks>
</configuration>
diff --git a/sandbox/ant/sca/branches/foo/itest/distribution/implementation-java-calculator/build.xml b/sandbox/ant/sca/branches/foo/itest/distribution/implementation-java-calculator/build.xml index 7aa5e828a0..3da5aace09 100644 --- a/sandbox/ant/sca/branches/foo/itest/distribution/implementation-java-calculator/build.xml +++ b/sandbox/ant/sca/branches/foo/itest/distribution/implementation-java-calculator/build.xml @@ -28,7 +28,7 @@ service sides of the sample.
-->
- <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-2.0-M2-SNAPSHOT-dir/tuscany-sca-2.0-M2-SNAPSHOT" />
+ <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-dir/tuscany-sca-${tuscany.version}" />
<target name="run">
diff --git a/sandbox/ant/sca/branches/foo/itest/distribution/implementation-java-calculator/pom.xml b/sandbox/ant/sca/branches/foo/itest/distribution/implementation-java-calculator/pom.xml index e76d328231..30497d09de 100644 --- a/sandbox/ant/sca/branches/foo/itest/distribution/implementation-java-calculator/pom.xml +++ b/sandbox/ant/sca/branches/foo/itest/distribution/implementation-java-calculator/pom.xml @@ -69,6 +69,7 @@ </goals>
<configuration>
<tasks>
+ <property name="tuscany.version" value="${version}" />
<ant antfile="./build.xml" target="run" />
</tasks>
</configuration>
diff --git a/sandbox/ant/sca/branches/foo/samples/binding-ws-calculator/build.xml b/sandbox/ant/sca/branches/foo/samples/binding-ws-calculator/build.xml index 21e6f918ca..e13ec494b0 100644 --- a/sandbox/ant/sca/branches/foo/samples/binding-ws-calculator/build.xml +++ b/sandbox/ant/sca/branches/foo/samples/binding-ws-calculator/build.xml @@ -35,10 +35,12 @@ source="1.5" target="1.5" failonerror="true"> - <classpath> - <pathelement location="../../modules/tuscany-sca-api-2.0-M2-SNAPSHOT.jar"/> - <pathelement location="../../modules/tuscany-node-api-2.0-M2-SNAPSHOT.jar"/> - </classpath> + <classpath> + <fileset dir="../../modules"> + <include name="tuscany-sca-api-*.jar" /> + <include name="tuscany-node-api-*.jar" /> + </fileset> + </classpath> </javac> <copy todir="target/classes"> <fileset dir="src/main/resources"/> diff --git a/sandbox/ant/sca/branches/foo/samples/calculator-rmi-reference/build.xml b/sandbox/ant/sca/branches/foo/samples/calculator-rmi-reference/build.xml index 42a83eb2e5..16d94c3b0b 100644 --- a/sandbox/ant/sca/branches/foo/samples/calculator-rmi-reference/build.xml +++ b/sandbox/ant/sca/branches/foo/samples/calculator-rmi-reference/build.xml @@ -36,10 +36,12 @@ source="1.5"
target="1.5"
failonerror="true">
- <classpath>
- <pathelement location="../../modules/tuscany-sca-api-2.0-M2-SNAPSHOT.jar"/>
- <pathelement location="../../modules/tuscany-node-api-2.0-M2-SNAPSHOT.jar"/>
- </classpath>
+ <classpath>
+ <fileset dir="../../modules">
+ <include name="tuscany-sca-api-*.jar" />
+ <include name="tuscany-node-api-*.jar" />
+ </fileset>
+ </classpath>
</javac>
<copy todir="target/classes">
<fileset dir="src/main/resources"/>
diff --git a/sandbox/ant/sca/branches/foo/samples/calculator-rmi-service/build.xml b/sandbox/ant/sca/branches/foo/samples/calculator-rmi-service/build.xml index be3bf5bac4..a0889ccc8a 100644 --- a/sandbox/ant/sca/branches/foo/samples/calculator-rmi-service/build.xml +++ b/sandbox/ant/sca/branches/foo/samples/calculator-rmi-service/build.xml @@ -36,10 +36,12 @@ source="1.5" target="1.5" failonerror="true"> - <classpath> - <pathelement location="../../modules/tuscany-sca-api-2.0-M2-SNAPSHOT.jar"/> - <pathelement location="../../modules/tuscany-node-api-2.0-M2-SNAPSHOT.jar"/> - </classpath> + <classpath> + <fileset dir="../../modules"> + <include name="tuscany-sca-api-*.jar" /> + <include name="tuscany-node-api-*.jar" /> + </fileset> + </classpath> </javac> <copy todir="target/classes"> <fileset dir="src/main/resources"/> diff --git a/sandbox/ant/sca/branches/foo/samples/calculator/build.xml b/sandbox/ant/sca/branches/foo/samples/calculator/build.xml index f1a7871e84..4411cae659 100644 --- a/sandbox/ant/sca/branches/foo/samples/calculator/build.xml +++ b/sandbox/ant/sca/branches/foo/samples/calculator/build.xml @@ -24,10 +24,12 @@ <target name="compile" depends="init"> <javac srcdir="src/main/java" destdir="target/classes" debug="on" source="1.5" target="1.5"> - <classpath> - <pathelement location="../../modules/tuscany-sca-api-2.0-M2-SNAPSHOT.jar"/> - <pathelement location="../../modules/tuscany-node-api-2.0-M2-SNAPSHOT.jar"/> - </classpath> + <classpath> + <fileset dir="../../modules"> + <include name="tuscany-sca-api-*.jar" /> + <include name="tuscany-node-api-*.jar" /> + </fileset> + </classpath> </javac> <copy todir="target/classes"> <fileset dir="src/main/resources"/> diff --git a/sandbox/ant/sca/branches/foo/samples/implementation-java-calculator/build.xml b/sandbox/ant/sca/branches/foo/samples/implementation-java-calculator/build.xml index 54e7d8fe20..db5f6a478f 100644 --- a/sandbox/ant/sca/branches/foo/samples/implementation-java-calculator/build.xml +++ b/sandbox/ant/sca/branches/foo/samples/implementation-java-calculator/build.xml @@ -35,9 +35,11 @@ source="1.5" target="1.5" failonerror="true"> - <classpath> - <pathelement location="../../modules/tuscany-sca-api-2.0-M2-SNAPSHOT.jar"/> - </classpath> + <classpath> + <fileset dir="../../modules"> + <include name="tuscany-sca-api-*.jar" /> + </fileset> + </classpath> </javac> <copy todir="target/classes"> <fileset dir="src/main/resources"/> |