Author: slaws
Date: Wed May 19 07:50:34 2010
New Revision: 946078
URL: http://svn.apache.org/viewvc?rev=946078&view=rev
Log:
update distro itests to match sample changes
Added:
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/
- copied from r945553,
tuscany/sca-java-2.x/trunk/itest/distribution/calculator-rmi/
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/
- copied from r945553,
tuscany/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/
- copied from r945553,
tuscany/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/
tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/
- copied from r945553,
tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/
Removed:
tuscany/sca-java-2.x/trunk/itest/distribution/calculator-rmi/
tuscany/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/build.xml
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/build.xml
tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/pom.xml
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/build.xml?rev=946078&r1=945553&r2=946078&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/build.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/build.xml
Wed May 19 07:50:34 2010
@@ -30,22 +30,10 @@
<property name="distro.root"
value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}"
/>
<target name="run">
-
- <parallel>
-
- <daemons>
- <ant antfile="build.xml"
- dir="${distro.root}/samples/calculator-rmi-service"/>
- </daemons>
-
- <sequential>
- <sleep seconds="25"/>
- <ant antfile="build.xml"
- dir="${distro.root}/samples/calculator-rmi-reference"/>
- </sequential>
-
- </parallel>
-
+ <ant antfile="build.xml"
+
dir="${distro.root}/samples/binding-rmi/contribution-calculator-reference"/>
+ <ant antfile="build.xml"
+
dir="${distro.root}/samples/binding-rmi/contribution-calculator-service"/>
</target>
</project>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/pom.xml?rev=946078&r1=945553&r2=946078&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/pom.xml
Wed May 19 07:50:34 2010
@@ -25,8 +25,8 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>itest-distribution-calculator-rmi</artifactId>
- <name>Apache Tuscany SCA iTest Distribution calculator-rmi</name>
+
<artifactId>itest-distribution-contribution-binding-rmi-calculator</artifactId>
+ <name>Apache Tuscany SCA iTest Distribution Contribution binding-rmi
Calculator</name>
<profiles>
<profile>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/pom.xml?rev=946078&r1=945553&r2=946078&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/pom.xml
Wed May 19 07:50:34 2010
@@ -25,8 +25,8 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>itest-distribution-implementation-java-calculator</artifactId>
- <name>Apache Tuscany SCA iTest Distribution
implementation-java-calculator</name>
+
<artifactId>itest-distribution-contribution-binding-sca-calculator</artifactId>
+ <name>Apache Tuscany SCA iTest Distribution
contribution-binding-sca-calculator</name>
<profiles>
<profile>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/pom.xml?rev=946078&r1=945553&r2=946078&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/pom.xml
Wed May 19 07:50:34 2010
@@ -25,8 +25,8 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>itest-distribution-implementation-java-calculator</artifactId>
- <name>Apache Tuscany SCA iTest Distribution
implementation-java-calculator</name>
+
<artifactId>itest-distribution-contribution-implementation-java-calculator</artifactId>
+ <name>Apache Tuscany SCA iTest Distribution
contribution-implementation-java-calculator</name>
<profiles>
<profile>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/build.xml?rev=946078&r1=945553&r2=946078&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/build.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/build.xml
Wed May 19 07:50:34 2010
@@ -33,7 +33,7 @@
<target name="run">
<ant antfile="build.xml"
- dir="${distro.root}/samples/launcher-embedded-jse"/>
+ dir="${distro.root}/samples/launcher-embedded-osgi"/>
</target>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/pom.xml?rev=946078&r1=945553&r2=946078&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/pom.xml
Wed May 19 07:50:34 2010
@@ -25,8 +25,8 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>itest-distribution-launcher-embedded-jse</artifactId>
- <name>Apache Tuscany SCA iTest Distribution Launcher Embedded JSE</name>
+ <artifactId>itest-distribution-launcher-embedded-osgi</artifactId>
+ <name>Apache Tuscany SCA iTest Distribution Launcher Embedded OSGi</name>
<profiles>
<profile>
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/pom.xml?rev=946078&r1=946077&r2=946078&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/pom.xml Wed May 19 07:50:34
2010
@@ -56,15 +56,12 @@
<modules>
<module>legal-checks</module>
-
-
- <!--module>implementation-java-calculator</module-->
-
-<!--
+ <module>contribution-binding-sca-calculator</module>
<module>contribution-binding-ws-calculator</module>
+ <module>contribution-binding-rmi-calculator</module>
+ <module>contribution-implementation-java-calculator</module>
<module>launcher-embedded-jse</module>
- <module>calculator-rmi</module>
--->
+ <module>launcher-embedded-osgi</module>
</modules>
<build>
