Make the distro itest Ant builds version neutral

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@756397 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 9 insertions, 5 deletions

diff --git a/java/sca/itest/distribution/bin-distro-unzip/build.xml b/java/sca/itest/distribution/bin-distro-unzip/build.xml
index f8d36410b7..7542fc23dd 100644
--- a/java/sca/itest/distribution/bin-distro-unzip/build.xml
+++ b/java/sca/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-SNAPSHOT.zip" 

-               dest="../../../distribution/all/target/apache-tuscany-sca-all-2.0-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/java/sca/itest/distribution/bin-distro-unzip/pom.xml b/java/sca/itest/distribution/bin-distro-unzip/pom.xml
index fe5fe64e88..17783d4cb5 100644
--- a/java/sca/itest/distribution/bin-distro-unzip/pom.xml
+++ b/java/sca/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/java/sca/itest/distribution/binding-ws-calculator/build.xml b/java/sca/itest/distribution/binding-ws-calculator/build.xml
index ee50366327..bfcdfe1063 100644
--- a/java/sca/itest/distribution/binding-ws-calculator/build.xml
+++ b/java/sca/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-SNAPSHOT-dir/tuscany-sca-2.0-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/java/sca/itest/distribution/binding-ws-calculator/pom.xml b/java/sca/itest/distribution/binding-ws-calculator/pom.xml
index 9e4dbe4a95..185e4370b5 100644
--- a/java/sca/itest/distribution/binding-ws-calculator/pom.xml
+++ b/java/sca/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/java/sca/itest/distribution/calculator-rmi/build.xml b/java/sca/itest/distribution/calculator-rmi/build.xml
index 679c1dcfdf..fb6f20f9c1 100644
--- a/java/sca/itest/distribution/calculator-rmi/build.xml
+++ b/java/sca/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-SNAPSHOT-dir/tuscany-sca-2.0-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/java/sca/itest/distribution/calculator-rmi/pom.xml b/java/sca/itest/distribution/calculator-rmi/pom.xml
index 5f53433292..88accdeefa 100644
--- a/java/sca/itest/distribution/calculator-rmi/pom.xml
+++ b/java/sca/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/java/sca/itest/distribution/implementation-java-calculator/build.xml b/java/sca/itest/distribution/implementation-java-calculator/build.xml
index 093ed715fc..3da5aace09 100644
--- a/java/sca/itest/distribution/implementation-java-calculator/build.xml
+++ b/java/sca/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-SNAPSHOT-dir/tuscany-sca-2.0-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/java/sca/itest/distribution/implementation-java-calculator/pom.xml b/java/sca/itest/distribution/implementation-java-calculator/pom.xml
index 9073e1eaa9..2ecf518ef1 100644
--- a/java/sca/itest/distribution/implementation-java-calculator/pom.xml
+++ b/java/sca/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>