You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/10/06 16:35:37 UTC
svn commit: r1005061 - in /tuscany/sca-java-2.x/trunk/testing:
compliance-tests/ itest/ itest/distribution/bin-distro-unzip/
itest/distribution/contribution-binding-rmi-calculator/
itest/distribution/contribution-binding-sca-calculator/ itest/distribut...
Author: antelder
Date: Wed Oct 6 14:35:36 2010
New Revision: 1005061
URL: http://svn.apache.org/viewvc?rev=1005061&view=rev
Log:
Update relative paths
Modified:
tuscany/sca-java-2.x/trunk/testing/compliance-tests/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/build.xml
tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/build.xml
tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/build.xml
tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/build.xml
tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/build.xml
tuscany/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/build.xml
tuscany/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/build.xml
tuscany/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/distribution/src-distro-rat/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/build.xml
tuscany/sca-java-2.x/trunk/testing/itest/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
Modified: tuscany/sca-java-2.x/trunk/testing/compliance-tests/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/compliance-tests/pom.xml?rev=1005061&r1=1005060&r2=1005061&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/compliance-tests/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/compliance-tests/pom.xml Wed Oct 6 14:35:36 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/build.xml?rev=1005061&r1=1005060&r2=1005061&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/build.xml Wed Oct 6 14:35:36 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/build.xml?rev=1005061&r1=1005060&r2=1005061&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/build.xml Wed Oct 6 14:35:36 2010
@@ -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"
Modified: tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/build.xml?rev=1005061&r1=1005060&r2=1005061&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/build.xml Wed Oct 6 14:35:36 2010
@@ -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">
Modified: tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/build.xml?rev=1005061&r1=1005060&r2=1005061&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/build.xml Wed Oct 6 14:35:36 2010
@@ -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">
Modified: tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/build.xml?rev=1005061&r1=1005060&r2=1005061&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/build.xml Wed Oct 6 14:35:36 2010
@@ -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">
Modified: tuscany/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/build.xml?rev=1005061&r1=1005060&r2=1005061&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/build.xml Wed Oct 6 14:35:36 2010
@@ -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">
Modified: tuscany/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/build.xml?rev=1005061&r1=1005060&r2=1005061&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/build.xml Wed Oct 6 14:35:36 2010
@@ -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">
Modified: tuscany/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/pom.xml?rev=1005061&r1=1005060&r2=1005061&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/pom.xml Wed Oct 6 14:35:36 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/distribution/src-distro-rat/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/distribution/src-distro-rat/pom.xml?rev=1005061&r1=1005060&r2=1005061&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/distribution/src-distro-rat/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/distribution/src-distro-rat/pom.xml Wed Oct 6 14:35:36 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/build.xml?rev=1005061&r1=1005060&r2=1005061&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/build.xml Wed Oct 6 14:35:36 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/pom.xml?rev=1005061&r1=1005060&r2=1005061&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/pom.xml Wed Oct 6 14:35:36 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java?rev=1005061&r1=1005060&r2=1005061&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java Wed Oct 6 14:35:36 2010
@@ -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);