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 2009/10/13 17:20:35 UTC
svn commit: r824803 - in
/tuscany/java/sca/otest/newlayout/tuscany-java-caa-test-runner: ./ pom.xml
src/test/resources/oasis-sca-tests.properties
Author: antelder
Date: Tue Oct 13 15:20:33 2009
New Revision: 824803
URL: http://svn.apache.org/viewvc?rev=824803&view=rev
Log:
Add start of tuscany runner for the SCA-J CAA tests
Added:
tuscany/java/sca/otest/newlayout/tuscany-java-caa-test-runner/
- copied from r824649, tuscany/java/sca/otest/newlayout/tuscany-test-runner/
Modified:
tuscany/java/sca/otest/newlayout/tuscany-java-caa-test-runner/pom.xml
tuscany/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/resources/oasis-sca-tests.properties
Modified: tuscany/java/sca/otest/newlayout/tuscany-java-caa-test-runner/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/otest/newlayout/tuscany-java-caa-test-runner/pom.xml?rev=824803&r1=824649&r2=824803&view=diff
==============================================================================
--- tuscany/java/sca/otest/newlayout/tuscany-java-caa-test-runner/pom.xml (original)
+++ tuscany/java/sca/otest/newlayout/tuscany-java-caa-test-runner/pom.xml Tue Oct 13 15:20:33 2009
@@ -25,8 +25,8 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tuscany-otests-asm-tests</artifactId>
- <name>Apache Tuscany SCA Specification Tests</name>
+ <artifactId>tuscany-otests-sca-j-caa-tests</artifactId>
+ <name>Apache Tuscany SCA Specification Tests for SCA-J CAA</name>
<dependencies>
<dependency>
@@ -43,6 +43,12 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-launcher-equinox</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -55,6 +61,12 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-jetty</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-otests-asm-General</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -63,7 +75,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-otests-asm-General_Java</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency>
+ </dependency -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -114,15 +126,40 @@
<configuration>
<tasks>
<ant antfile="../build.xml">
- <property name="from.dir" value="../sca-assembly/Test_Client/src/main/resources"/>
+ <property name="from.dir" value="../sca-java-caa/Test_Client_JavaCAA/src/main/resources"/>
<property name="to.dir" value="src/main/resources"/>
<target name="copyResourceDir"/>
</ant>
<ant antfile="../build.xml">
- <property name="from.dir" value="../sca-assembly/Test_Client/src/main/java"/>
+ <property name="from.dir" value="../sca-java-caa/Test_Client_JavaCAA/src/main/java"/>
<property name="to.dir" value="src/test/java"/>
<target name="copySourceDir"/>
</ant>
+ <ant antfile="../build.xml">
+ <property name="from.dir" value="../sca-assembly/Test_Client/src/main/java/testClient"/>
+ <property name="to.dir" value="src/test/java/testClient"/>
+ <target name="copySourceDir"/>
+ </ant>
+ <ant antfile="../build.xml">
+ <property name="from.file" value="../sca-assembly/Test_Client/src/main/java/client/BaseJAXWSTestCase.java"/>
+ <property name="to.file" value="src/test/java/client/BaseJAXWSTestCase.java"/>
+ <target name="copyFile"/>
+ </ant>
+ <ant antfile="../build.xml">
+ <property name="from.file" value="../sca-assembly/Test_Client/src/main/java/client/RuntimeBridge.java"/>
+ <property name="to.file" value="src/test/java/client/RuntimeBridge.java"/>
+ <target name="copyFile"/>
+ </ant>
+ <ant antfile="../build.xml">
+ <property name="from.file" value="../sca-assembly/Test_Client/src/main/java/client/TestConfiguration.java"/>
+ <property name="to.file" value="src/test/java/client/TestConfiguration.java"/>
+ <target name="copyFile"/>
+ </ant>
+ <ant antfile="../build.xml">
+ <property name="from.file" value="../sca-assembly/Test_Client/src/main/java/client/TuscanyRuntimeBridge.java"/>
+ <property name="to.file" value="src/test/java/client/TuscanyRuntimeBridge.java"/>
+ <target name="copyFile"/>
+ </ant>
</tasks>
</configuration>
</execution>
Modified: tuscany/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/resources/oasis-sca-tests.properties
URL: http://svn.apache.org/viewvc/tuscany/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/resources/oasis-sca-tests.properties?rev=824803&r1=824649&r2=824803&view=diff
==============================================================================
--- tuscany/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/resources/oasis-sca-tests.properties (original)
+++ tuscany/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/resources/oasis-sca-tests.properties Tue Oct 13 15:20:33 2009
@@ -18,7 +18,7 @@
# OASIS SCA Assembly test properties
# The implementation type to use for Assembly test suite
# org.oasis.sca.tests.assembly.lang=BPEL
-org.oasis.sca.tests.assembly.lang=Java
+org.oasis.sca.tests.assembly.lang=POJO
# The class to use as the Runtime Bridge for the SCA runtime under test
#org.oasis.sca.tests.assembly.runtime_bridge=org.apache.tuscany.sca.otest.TuscanyOSGiRuntimeBridge
@@ -26,5 +26,5 @@
# The location of the contributions for the test suite
# %1 represents the placement of the name of each contribution into the location URI
-org.oasis.sca.tests.assembly.contribution.location=../sca-assembly/%1/target/%1.zip
+org.oasis.sca.tests.assembly.contribution.location=../sca-java-caa/%1/target/%1.zip