Update relative paths

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

13 files changed, 17 insertions, 17 deletions

diff --git a/sca-java-2.x/trunk/testing/compliance-tests/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/pom.xml
index d39264561c..fd1d8e8100 100644
--- a/sca-java-2.x/trunk/testing/compliance-tests/pom.xml
+++ b/sca-java-2.x/trunk/testing/compliance-tests/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.tuscany.sca</groupId>

         <artifactId>tuscany-sca</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../pom.xml</relativePath>

     </parent>

 

     <packaging>pom</packaging>

diff --git a/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/build.xml b/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/build.xml
index 6c4b1fdf3f..6e6a1ea9ef 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/build.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/build.xml
@@ -19,9 +19,9 @@
 <project name="itest-unzip" default="unzip"> 
 
     <target name="unzip"> 
-        <delete dir="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir"/>
-        <unzip src="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.zip" 
-               dest="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir"/>
+        <delete dir="../../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.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/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/build.xml b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/build.xml
index b3fe651c36..7550f70fb5 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/build.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/build.xml
@@ -27,7 +27,7 @@
 	    service sides of the sample.
 	-->
 
-    <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" />
+    <property name="distro.root" value="../../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" />
 
     <target name="run"> 
         <ant antfile="build.xml"
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/build.xml b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/build.xml
index 2e7c182bf3..aa13cba49b 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/build.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/build.xml
@@ -28,7 +28,7 @@
 	    service sides of the sample.
 	-->
 
-    <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" />
+    <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/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/build.xml b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/build.xml
index 2cd66aa9a2..7b95bedf6c 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/build.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/contribution-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-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" />
+    <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/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/build.xml b/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/build.xml
index 70a2207e11..e70619ab51 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/build.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/contribution-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-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" />
+    <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/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/build.xml b/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/build.xml
index fa19e10325..6bf801d4af 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/build.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/build.xml
@@ -28,7 +28,7 @@
 	    service sides of the sample.
 	-->
 
-    <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" />
+    <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/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/build.xml b/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/build.xml
index 6a36cf30cd..0015b13f49 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/build.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/build.xml
@@ -28,7 +28,7 @@
 	    service sides of the sample.
 	-->
 
-    <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" />
+    <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/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/pom.xml
index 7c4ae743f6..92296d091f 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/pom.xml
@@ -56,7 +56,7 @@
                             </execution>
                         </executions>
                         <configuration>
-                           <basedir>../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT.dir</basedir>
+                           <basedir>../../../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT.dir</basedir>
                            <excludeSubProjects>false</excludeSubProjects>
                            <excludes> 
                               <exclude>tuscany-sca-2.0-SNAPSHOT/CHANGES</exclude>
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/src-distro-rat/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/src-distro-rat/pom.xml
index 541b1c9830..93dcfa4ffb 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/src-distro-rat/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/src-distro-rat/pom.xml
@@ -56,7 +56,7 @@
                             </execution>
                         </executions>
                         <configuration>
-                           <basedir>../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-src.dir</basedir>
+                           <basedir>../../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-src.dir</basedir>
                            <excludeSubProjects>false</excludeSubProjects>
                            <excludes> 
                               <exclude>tuscany-sca-2.0-SNAPSHOT-src/CHANGES</exclude>
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/build.xml b/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/build.xml
index c98e19b6a0..db9fe4a969 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/build.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/build.xml
@@ -19,9 +19,9 @@
 <project name="itest-unzip" default="unzip"> 
 
     <target name="unzip">
-        <delete dir="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-src.dir"/>
-        <unzip src="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-src.zip" 
-               dest="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-src.dir"/>
+        <delete dir="../../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-src.dir"/>
+        <unzip src="../../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-src.zip" 
+               dest="../../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-src.dir"/>
     </target>
 
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/pom.xml b/sca-java-2.x/trunk/testing/itest/pom.xml
index a016665cdb..fa900c48a4 100644
--- a/sca-java-2.x/trunk/testing/itest/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-itest</artifactId>
     <packaging>pom</packaging>
diff --git a/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java b/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
index 82aa047c2d..6b3759c532 100644
--- a/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
+++ b/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
@@ -47,7 +47,7 @@ public class ContributionTestCase {
     @Test

     public void testRead() throws Exception {

         Deployer deployer = new DefaultDeployer();

-        File file = new File("../../samples/learning-more/binding-sca/calculator-contribution/target/sample-contribution-binding-sca-calculator.jar");

+        File file = new File("../../../samples/learning-more/binding-sca/calculator-contribution/target/sample-contribution-binding-sca-calculator.jar");

         URL url = file.toURI().toURL();

         Monitor monitor = deployer.createMonitor();

         Contribution contribution = deployer.loadContribution(url.toURI(), url, monitor);