From 75558fef044008f76c928637fc59f1516cc3faf0 Mon Sep 17 00:00:00 2001 From: antelder Date: Tue, 3 Nov 2009 11:04:28 +0000 Subject: Delete old otest location, now moved to https://svn.apache.org/repos/asf/tuscany/otest/ git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@832392 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/otest/README.txt | 6 - java/sca/otest/current/ASM_10001/pom.xml | 79 -------- java/sca/otest/current/ASM_10003/pom.xml | 79 -------- java/sca/otest/current/ASM_12001/pom.xml | 79 -------- java/sca/otest/current/ASM_12002/pom.xml | 79 -------- java/sca/otest/current/ASM_12003/pom.xml | 79 -------- java/sca/otest/current/ASM_12005/pom.xml | 79 -------- java/sca/otest/current/ASM_12007/pom.xml | 79 -------- java/sca/otest/current/ASM_12008/pom.xml | 79 -------- java/sca/otest/current/ASM_12009/pom.xml | 79 -------- java/sca/otest/current/ASM_12010/pom.xml | 79 -------- java/sca/otest/current/ASM_12012/pom.xml | 79 -------- java/sca/otest/current/ASM_12013/pom.xml | 79 -------- java/sca/otest/current/ASM_13001/pom.xml | 79 -------- java/sca/otest/current/ASM_13002/pom.xml | 79 -------- java/sca/otest/current/ASM_13003/pom.xml | 79 -------- java/sca/otest/current/ASM_13004/pom.xml | 79 -------- java/sca/otest/current/ASM_13005/pom.xml | 79 -------- java/sca/otest/current/ASM_13006/pom.xml | 79 -------- java/sca/otest/current/ASM_13007/pom.xml | 79 -------- java/sca/otest/current/ASM_13008/pom.xml | 79 -------- java/sca/otest/current/ASM_4002/pom.xml | 79 -------- java/sca/otest/current/ASM_4003/pom.xml | 79 -------- java/sca/otest/current/ASM_4004/pom.xml | 79 -------- java/sca/otest/current/ASM_4005/pom.xml | 79 -------- java/sca/otest/current/ASM_4007/pom.xml | 79 -------- java/sca/otest/current/ASM_5004/pom.xml | 79 -------- java/sca/otest/current/ASM_5005/pom.xml | 79 -------- java/sca/otest/current/ASM_5007/pom.xml | 79 -------- java/sca/otest/current/ASM_5009/pom.xml | 79 -------- java/sca/otest/current/ASM_5023/pom.xml | 79 -------- java/sca/otest/current/ASM_5024/pom.xml | 79 -------- java/sca/otest/current/ASM_5027/pom.xml | 79 -------- java/sca/otest/current/ASM_5030/pom.xml | 79 -------- java/sca/otest/current/ASM_5035/pom.xml | 79 -------- java/sca/otest/current/ASM_6001/pom.xml | 79 -------- java/sca/otest/current/ASM_6002/pom.xml | 79 -------- java/sca/otest/current/ASM_6003/pom.xml | 79 -------- java/sca/otest/current/ASM_6005/pom.xml | 79 -------- java/sca/otest/current/ASM_6006/pom.xml | 79 -------- java/sca/otest/current/ASM_6008/pom.xml | 79 -------- java/sca/otest/current/ASM_6012/pom.xml | 79 -------- java/sca/otest/current/ASM_6021/pom.xml | 79 -------- java/sca/otest/current/ASM_6022/pom.xml | 79 -------- java/sca/otest/current/ASM_6025/pom.xml | 79 -------- java/sca/otest/current/ASM_6028/pom.xml | 79 -------- java/sca/otest/current/ASM_6029/pom.xml | 79 -------- java/sca/otest/current/ASM_6031/pom.xml | 79 -------- java/sca/otest/current/ASM_6032/pom.xml | 79 -------- java/sca/otest/current/ASM_6033/pom.xml | 79 -------- java/sca/otest/current/ASM_7001/pom.xml | 79 -------- java/sca/otest/current/ASM_7007/pom.xml | 79 -------- java/sca/otest/current/ASM_7008/pom.xml | 79 -------- java/sca/otest/current/ASM_7009/pom.xml | 79 -------- java/sca/otest/current/ASM_7010/pom.xml | 79 -------- java/sca/otest/current/ASM_8001/pom.xml | 79 -------- java/sca/otest/current/ASM_8001_Java/pom.xml | 79 -------- java/sca/otest/current/ASM_8003/pom.xml | 79 -------- java/sca/otest/current/ASM_8004/pom.xml | 84 -------- java/sca/otest/current/ASM_8005/pom.xml | 79 -------- java/sca/otest/current/ASM_8010/pom.xml | 79 -------- java/sca/otest/current/ASM_8011/pom.xml | 79 -------- java/sca/otest/current/ASM_8012/pom.xml | 79 -------- java/sca/otest/current/ASM_8017/pom.xml | 79 -------- java/sca/otest/current/ASM_8019/pom.xml | 79 -------- java/sca/otest/current/ASM_9002/pom.xml | 79 -------- java/sca/otest/current/Contribution1/pom.xml | 79 -------- java/sca/otest/current/Contribution2/pom.xml | 79 -------- java/sca/otest/current/General/ASM_8002.odg | Bin 16042 -> 0 bytes java/sca/otest/current/General/pom.xml | 71 ------- java/sca/otest/current/General_C/pom.xml | 39 ---- java/sca/otest/current/General_CPP/pom.xml | 39 ---- java/sca/otest/current/General_Java/pom.xml | 79 -------- java/sca/otest/current/README | 64 ------ java/sca/otest/current/build.xml | 147 -------------- java/sca/otest/current/pom.xml | 143 ------------- java/sca/otest/current/template-pom.xml | 79 -------- java/sca/otest/current/tests/pom.xml | 161 --------------- .../resources/oasis-sca-tests-errors.properties | 19 -- .../src/main/resources/oasis-sca-tests.properties | 32 --- .../sca/otest/TuscanyOSGiRuntimeBridge.java | 128 ------------ .../tuscany/sca/otest/TuscanyRuntimeBridge.java | 164 --------------- .../src/test/resources/oasis-sca-tests.properties | 20 -- java/sca/otest/newlayout/README | 68 ------- java/sca/otest/newlayout/build.xml | 56 ------ java/sca/otest/newlayout/pom.xml | 92 --------- .../newlayout/tuscany-java-caa-test-runner/pom.xml | 183 ----------------- .../src/test/resources/oasis-sca-tests.properties | 30 --- .../tuscany-oasis-sca-tests-errors.properties | 56 ------ .../sca/otest/TuscanyOSGiRuntimeBridge.java | 164 --------------- .../tuscany/sca/otest/TuscanyRuntimeBridge.java | 208 ------------------- .../otest/newlayout/tuscany-test-runner/pom.xml | 170 ---------------- .../src/test/resources/oasis-sca-tests.properties | 30 --- .../tuscany-oasis-sca-tests-errors.properties | 86 -------- .../sca/otest/TuscanyOSGiRuntimeBridge.java | 164 --------------- .../tuscany/sca/otest/TuscanyRuntimeBridge.java | 223 --------------------- 96 files changed, 8019 deletions(-) delete mode 100644 java/sca/otest/README.txt delete mode 100644 java/sca/otest/current/ASM_10001/pom.xml delete mode 100644 java/sca/otest/current/ASM_10003/pom.xml delete mode 100644 java/sca/otest/current/ASM_12001/pom.xml delete mode 100644 java/sca/otest/current/ASM_12002/pom.xml delete mode 100644 java/sca/otest/current/ASM_12003/pom.xml delete mode 100644 java/sca/otest/current/ASM_12005/pom.xml delete mode 100644 java/sca/otest/current/ASM_12007/pom.xml delete mode 100644 java/sca/otest/current/ASM_12008/pom.xml delete mode 100644 java/sca/otest/current/ASM_12009/pom.xml delete mode 100644 java/sca/otest/current/ASM_12010/pom.xml delete mode 100644 java/sca/otest/current/ASM_12012/pom.xml delete mode 100644 java/sca/otest/current/ASM_12013/pom.xml delete mode 100644 java/sca/otest/current/ASM_13001/pom.xml delete mode 100644 java/sca/otest/current/ASM_13002/pom.xml delete mode 100644 java/sca/otest/current/ASM_13003/pom.xml delete mode 100644 java/sca/otest/current/ASM_13004/pom.xml delete mode 100644 java/sca/otest/current/ASM_13005/pom.xml delete mode 100644 java/sca/otest/current/ASM_13006/pom.xml delete mode 100644 java/sca/otest/current/ASM_13007/pom.xml delete mode 100644 java/sca/otest/current/ASM_13008/pom.xml delete mode 100644 java/sca/otest/current/ASM_4002/pom.xml delete mode 100644 java/sca/otest/current/ASM_4003/pom.xml delete mode 100644 java/sca/otest/current/ASM_4004/pom.xml delete mode 100644 java/sca/otest/current/ASM_4005/pom.xml delete mode 100644 java/sca/otest/current/ASM_4007/pom.xml delete mode 100644 java/sca/otest/current/ASM_5004/pom.xml delete mode 100644 java/sca/otest/current/ASM_5005/pom.xml delete mode 100644 java/sca/otest/current/ASM_5007/pom.xml delete mode 100644 java/sca/otest/current/ASM_5009/pom.xml delete mode 100644 java/sca/otest/current/ASM_5023/pom.xml delete mode 100644 java/sca/otest/current/ASM_5024/pom.xml delete mode 100644 java/sca/otest/current/ASM_5027/pom.xml delete mode 100644 java/sca/otest/current/ASM_5030/pom.xml delete mode 100644 java/sca/otest/current/ASM_5035/pom.xml delete mode 100644 java/sca/otest/current/ASM_6001/pom.xml delete mode 100644 java/sca/otest/current/ASM_6002/pom.xml delete mode 100644 java/sca/otest/current/ASM_6003/pom.xml delete mode 100644 java/sca/otest/current/ASM_6005/pom.xml delete mode 100644 java/sca/otest/current/ASM_6006/pom.xml delete mode 100644 java/sca/otest/current/ASM_6008/pom.xml delete mode 100644 java/sca/otest/current/ASM_6012/pom.xml delete mode 100644 java/sca/otest/current/ASM_6021/pom.xml delete mode 100644 java/sca/otest/current/ASM_6022/pom.xml delete mode 100644 java/sca/otest/current/ASM_6025/pom.xml delete mode 100644 java/sca/otest/current/ASM_6028/pom.xml delete mode 100644 java/sca/otest/current/ASM_6029/pom.xml delete mode 100644 java/sca/otest/current/ASM_6031/pom.xml delete mode 100644 java/sca/otest/current/ASM_6032/pom.xml delete mode 100644 java/sca/otest/current/ASM_6033/pom.xml delete mode 100644 java/sca/otest/current/ASM_7001/pom.xml delete mode 100644 java/sca/otest/current/ASM_7007/pom.xml delete mode 100644 java/sca/otest/current/ASM_7008/pom.xml delete mode 100644 java/sca/otest/current/ASM_7009/pom.xml delete mode 100644 java/sca/otest/current/ASM_7010/pom.xml delete mode 100644 java/sca/otest/current/ASM_8001/pom.xml delete mode 100644 java/sca/otest/current/ASM_8001_Java/pom.xml delete mode 100644 java/sca/otest/current/ASM_8003/pom.xml delete mode 100644 java/sca/otest/current/ASM_8004/pom.xml delete mode 100644 java/sca/otest/current/ASM_8005/pom.xml delete mode 100644 java/sca/otest/current/ASM_8010/pom.xml delete mode 100644 java/sca/otest/current/ASM_8011/pom.xml delete mode 100644 java/sca/otest/current/ASM_8012/pom.xml delete mode 100644 java/sca/otest/current/ASM_8017/pom.xml delete mode 100644 java/sca/otest/current/ASM_8019/pom.xml delete mode 100644 java/sca/otest/current/ASM_9002/pom.xml delete mode 100644 java/sca/otest/current/Contribution1/pom.xml delete mode 100644 java/sca/otest/current/Contribution2/pom.xml delete mode 100644 java/sca/otest/current/General/ASM_8002.odg delete mode 100644 java/sca/otest/current/General/pom.xml delete mode 100644 java/sca/otest/current/General_C/pom.xml delete mode 100644 java/sca/otest/current/General_CPP/pom.xml delete mode 100644 java/sca/otest/current/General_Java/pom.xml delete mode 100644 java/sca/otest/current/README delete mode 100644 java/sca/otest/current/build.xml delete mode 100644 java/sca/otest/current/pom.xml delete mode 100644 java/sca/otest/current/template-pom.xml delete mode 100644 java/sca/otest/current/tests/pom.xml delete mode 100644 java/sca/otest/current/tests/src/main/resources/oasis-sca-tests-errors.properties delete mode 100644 java/sca/otest/current/tests/src/main/resources/oasis-sca-tests.properties delete mode 100644 java/sca/otest/current/tests/src/main/ttest/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java delete mode 100644 java/sca/otest/current/tests/src/main/ttest/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java delete mode 100644 java/sca/otest/current/tests/src/test/resources/oasis-sca-tests.properties delete mode 100644 java/sca/otest/newlayout/README delete mode 100644 java/sca/otest/newlayout/build.xml delete mode 100644 java/sca/otest/newlayout/pom.xml delete mode 100644 java/sca/otest/newlayout/tuscany-java-caa-test-runner/pom.xml delete mode 100644 java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/resources/oasis-sca-tests.properties delete mode 100644 java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties delete mode 100644 java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java delete mode 100644 java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java delete mode 100644 java/sca/otest/newlayout/tuscany-test-runner/pom.xml delete mode 100644 java/sca/otest/newlayout/tuscany-test-runner/src/test/resources/oasis-sca-tests.properties delete mode 100644 java/sca/otest/newlayout/tuscany-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties delete mode 100644 java/sca/otest/newlayout/tuscany-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java delete mode 100644 java/sca/otest/newlayout/tuscany-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java (limited to 'java') diff --git a/java/sca/otest/README.txt b/java/sca/otest/README.txt deleted file mode 100644 index a0332a7446..0000000000 --- a/java/sca/otest/README.txt +++ /dev/null @@ -1,6 +0,0 @@ -Tests are pulled into the fixed_version and currrent subdirectories using svn:externals -to extract the tests directly from oasis. As we don't have control over changes in the -OASIS build structure, the extraction into the fixed_version will be a selected OASIS -svn repository version, intended to be stable (though not necessarily all tests passing) - -(the fixed_version directory has been removed for the time being) diff --git a/java/sca/otest/current/ASM_10001/pom.xml b/java/sca/otest/current/ASM_10001/pom.xml deleted file mode 100644 index 50ac4f9291..0000000000 --- a/java/sca/otest/current/ASM_10001/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_10001 - Apache Tuscany SCA Specification Tests ASM_10001 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_10003/pom.xml b/java/sca/otest/current/ASM_10003/pom.xml deleted file mode 100644 index 44f22effa8..0000000000 --- a/java/sca/otest/current/ASM_10003/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_10003 - Apache Tuscany SCA Specification Tests ASM_10003 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_12001/pom.xml b/java/sca/otest/current/ASM_12001/pom.xml deleted file mode 100644 index dd89230de6..0000000000 --- a/java/sca/otest/current/ASM_12001/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_12001 - Apache Tuscany SCA Specification Tests ASM_12001 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_12002/pom.xml b/java/sca/otest/current/ASM_12002/pom.xml deleted file mode 100644 index a2097cc6fa..0000000000 --- a/java/sca/otest/current/ASM_12002/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_12002 - Apache Tuscany SCA Specification Tests ASM_12002 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_12003/pom.xml b/java/sca/otest/current/ASM_12003/pom.xml deleted file mode 100644 index a3c8d29691..0000000000 --- a/java/sca/otest/current/ASM_12003/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_12003 - Apache Tuscany SCA Specification Tests ASM_12003 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_12005/pom.xml b/java/sca/otest/current/ASM_12005/pom.xml deleted file mode 100644 index f182f91a14..0000000000 --- a/java/sca/otest/current/ASM_12005/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_12005 - Apache Tuscany SCA Specification Tests ASM_12005 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_12007/pom.xml b/java/sca/otest/current/ASM_12007/pom.xml deleted file mode 100644 index 910015aebb..0000000000 --- a/java/sca/otest/current/ASM_12007/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_12007 - Apache Tuscany SCA Specification Tests ASM_12007 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_12008/pom.xml b/java/sca/otest/current/ASM_12008/pom.xml deleted file mode 100644 index d8447998a5..0000000000 --- a/java/sca/otest/current/ASM_12008/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_12008 - Apache Tuscany SCA Specification Tests ASM_12008 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_12009/pom.xml b/java/sca/otest/current/ASM_12009/pom.xml deleted file mode 100644 index f281eaddff..0000000000 --- a/java/sca/otest/current/ASM_12009/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_12009 - Apache Tuscany SCA Specification Tests ASM_12009 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_12010/pom.xml b/java/sca/otest/current/ASM_12010/pom.xml deleted file mode 100644 index c69f528b78..0000000000 --- a/java/sca/otest/current/ASM_12010/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_12010 - Apache Tuscany SCA Specification Tests ASM_12010 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_12012/pom.xml b/java/sca/otest/current/ASM_12012/pom.xml deleted file mode 100644 index 9260fc4ee8..0000000000 --- a/java/sca/otest/current/ASM_12012/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_12012 - Apache Tuscany SCA Specification Tests ASM_12012 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_12013/pom.xml b/java/sca/otest/current/ASM_12013/pom.xml deleted file mode 100644 index a2cba3f24c..0000000000 --- a/java/sca/otest/current/ASM_12013/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_12013 - Apache Tuscany SCA Specification Tests ASM_12013 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_13001/pom.xml b/java/sca/otest/current/ASM_13001/pom.xml deleted file mode 100644 index ef6aa4c24c..0000000000 --- a/java/sca/otest/current/ASM_13001/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_13001 - Apache Tuscany SCA Specification Tests ASM_13001 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_13002/pom.xml b/java/sca/otest/current/ASM_13002/pom.xml deleted file mode 100644 index 47b8a115c7..0000000000 --- a/java/sca/otest/current/ASM_13002/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_13002 - Apache Tuscany SCA Specification Tests ASM_13002 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_13003/pom.xml b/java/sca/otest/current/ASM_13003/pom.xml deleted file mode 100644 index aac5095e5d..0000000000 --- a/java/sca/otest/current/ASM_13003/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_13003 - Apache Tuscany SCA Specification Tests ASM_13003 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_13004/pom.xml b/java/sca/otest/current/ASM_13004/pom.xml deleted file mode 100644 index d92ce40164..0000000000 --- a/java/sca/otest/current/ASM_13004/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_13004 - Apache Tuscany SCA Specification Tests ASM_13004 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_13005/pom.xml b/java/sca/otest/current/ASM_13005/pom.xml deleted file mode 100644 index 435095576b..0000000000 --- a/java/sca/otest/current/ASM_13005/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_13005 - Apache Tuscany SCA Specification Tests ASM_13005 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_13006/pom.xml b/java/sca/otest/current/ASM_13006/pom.xml deleted file mode 100644 index 787da1ef6b..0000000000 --- a/java/sca/otest/current/ASM_13006/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_13006 - Apache Tuscany SCA Specification Tests ASM_13006 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_13007/pom.xml b/java/sca/otest/current/ASM_13007/pom.xml deleted file mode 100644 index a9e43d8d88..0000000000 --- a/java/sca/otest/current/ASM_13007/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_13007 - Apache Tuscany SCA Specification Tests ASM_13007 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_13008/pom.xml b/java/sca/otest/current/ASM_13008/pom.xml deleted file mode 100644 index 827292ceb6..0000000000 --- a/java/sca/otest/current/ASM_13008/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_13008 - Apache Tuscany SCA Specification Tests ASM_13008 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_4002/pom.xml b/java/sca/otest/current/ASM_4002/pom.xml deleted file mode 100644 index 86946ca07f..0000000000 --- a/java/sca/otest/current/ASM_4002/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_4002 - Apache Tuscany SCA Specification Tests ASM_4002 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_4003/pom.xml b/java/sca/otest/current/ASM_4003/pom.xml deleted file mode 100644 index b7534fecf2..0000000000 --- a/java/sca/otest/current/ASM_4003/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_4003 - Apache Tuscany SCA Specification Tests ASM_4003 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_4004/pom.xml b/java/sca/otest/current/ASM_4004/pom.xml deleted file mode 100644 index 42e2175a7e..0000000000 --- a/java/sca/otest/current/ASM_4004/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_4004 - Apache Tuscany SCA Specification Tests ASM_4004 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_4005/pom.xml b/java/sca/otest/current/ASM_4005/pom.xml deleted file mode 100644 index e1d360d453..0000000000 --- a/java/sca/otest/current/ASM_4005/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_4005 - Apache Tuscany SCA Specification Tests ASM_4005 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_4007/pom.xml b/java/sca/otest/current/ASM_4007/pom.xml deleted file mode 100644 index ec20180613..0000000000 --- a/java/sca/otest/current/ASM_4007/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_4007 - Apache Tuscany SCA Specification Tests ASM_4007 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_5004/pom.xml b/java/sca/otest/current/ASM_5004/pom.xml deleted file mode 100644 index bb623e0483..0000000000 --- a/java/sca/otest/current/ASM_5004/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_5004 - Apache Tuscany SCA Specification Tests ASM_5004 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_5005/pom.xml b/java/sca/otest/current/ASM_5005/pom.xml deleted file mode 100644 index fe5be2e202..0000000000 --- a/java/sca/otest/current/ASM_5005/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_5005 - Apache Tuscany SCA Specification Tests ASM_5005 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_5007/pom.xml b/java/sca/otest/current/ASM_5007/pom.xml deleted file mode 100644 index db4f2440cb..0000000000 --- a/java/sca/otest/current/ASM_5007/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_5007 - Apache Tuscany SCA Specification Tests ASM_5007 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_5009/pom.xml b/java/sca/otest/current/ASM_5009/pom.xml deleted file mode 100644 index 027cb44e35..0000000000 --- a/java/sca/otest/current/ASM_5009/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_5009 - Apache Tuscany SCA Specification Tests ASM_5009 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_5023/pom.xml b/java/sca/otest/current/ASM_5023/pom.xml deleted file mode 100644 index 7903fbb52b..0000000000 --- a/java/sca/otest/current/ASM_5023/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_5023 - Apache Tuscany SCA Specification Tests ASM_5023 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_5024/pom.xml b/java/sca/otest/current/ASM_5024/pom.xml deleted file mode 100644 index 99d3eb8d69..0000000000 --- a/java/sca/otest/current/ASM_5024/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_5024 - Apache Tuscany SCA Specification Tests ASM_5024 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_5027/pom.xml b/java/sca/otest/current/ASM_5027/pom.xml deleted file mode 100644 index 0b4bbc2073..0000000000 --- a/java/sca/otest/current/ASM_5027/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_5027 - Apache Tuscany SCA Specification Tests ASM_5027 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_5030/pom.xml b/java/sca/otest/current/ASM_5030/pom.xml deleted file mode 100644 index 705addede5..0000000000 --- a/java/sca/otest/current/ASM_5030/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_5030 - Apache Tuscany SCA Specification Tests ASM_5030 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_5035/pom.xml b/java/sca/otest/current/ASM_5035/pom.xml deleted file mode 100644 index 7f4e481200..0000000000 --- a/java/sca/otest/current/ASM_5035/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_5035 - Apache Tuscany SCA Specification Tests ASM_5035 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_6001/pom.xml b/java/sca/otest/current/ASM_6001/pom.xml deleted file mode 100644 index 086f83bf01..0000000000 --- a/java/sca/otest/current/ASM_6001/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_6001 - Apache Tuscany SCA Specification Tests ASM_6001 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_6002/pom.xml b/java/sca/otest/current/ASM_6002/pom.xml deleted file mode 100644 index 0c99324771..0000000000 --- a/java/sca/otest/current/ASM_6002/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_6002 - Apache Tuscany SCA Specification Tests ASM_6002 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_6003/pom.xml b/java/sca/otest/current/ASM_6003/pom.xml deleted file mode 100644 index c6c3513a9a..0000000000 --- a/java/sca/otest/current/ASM_6003/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_6003 - Apache Tuscany SCA Specification Tests ASM_6003 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_6005/pom.xml b/java/sca/otest/current/ASM_6005/pom.xml deleted file mode 100644 index cac1165fa8..0000000000 --- a/java/sca/otest/current/ASM_6005/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_6005 - Apache Tuscany SCA Specification Tests ASM_6005 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_6006/pom.xml b/java/sca/otest/current/ASM_6006/pom.xml deleted file mode 100644 index f893fbf04c..0000000000 --- a/java/sca/otest/current/ASM_6006/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_6006 - Apache Tuscany SCA Specification Tests ASM_6006 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_6008/pom.xml b/java/sca/otest/current/ASM_6008/pom.xml deleted file mode 100644 index 11fed78091..0000000000 --- a/java/sca/otest/current/ASM_6008/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_6008 - Apache Tuscany SCA Specification Tests ASM_6008 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_6012/pom.xml b/java/sca/otest/current/ASM_6012/pom.xml deleted file mode 100644 index 5500f936cc..0000000000 --- a/java/sca/otest/current/ASM_6012/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_6012 - Apache Tuscany SCA Specification Tests ASM_6012 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_6021/pom.xml b/java/sca/otest/current/ASM_6021/pom.xml deleted file mode 100644 index d63207c8e7..0000000000 --- a/java/sca/otest/current/ASM_6021/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_6021 - Apache Tuscany SCA Specification Tests ASM_6021 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_6022/pom.xml b/java/sca/otest/current/ASM_6022/pom.xml deleted file mode 100644 index 738b887ce5..0000000000 --- a/java/sca/otest/current/ASM_6022/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_6022 - Apache Tuscany SCA Specification Tests ASM_6022 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_6025/pom.xml b/java/sca/otest/current/ASM_6025/pom.xml deleted file mode 100644 index 1d670c3289..0000000000 --- a/java/sca/otest/current/ASM_6025/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_6025 - Apache Tuscany SCA Specification Tests ASM_6025 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_6028/pom.xml b/java/sca/otest/current/ASM_6028/pom.xml deleted file mode 100644 index 786435e8ab..0000000000 --- a/java/sca/otest/current/ASM_6028/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_6028 - Apache Tuscany SCA Specification Tests ASM_6028 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_6029/pom.xml b/java/sca/otest/current/ASM_6029/pom.xml deleted file mode 100644 index 507d0ff4ff..0000000000 --- a/java/sca/otest/current/ASM_6029/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_6029 - Apache Tuscany SCA Specification Tests ASM_6029 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_6031/pom.xml b/java/sca/otest/current/ASM_6031/pom.xml deleted file mode 100644 index 286c2750e0..0000000000 --- a/java/sca/otest/current/ASM_6031/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_6031 - Apache Tuscany SCA Specification Tests ASM_6031 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_6032/pom.xml b/java/sca/otest/current/ASM_6032/pom.xml deleted file mode 100644 index d416df3ecd..0000000000 --- a/java/sca/otest/current/ASM_6032/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_6032 - Apache Tuscany SCA Specification Tests ASM_6032 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_6033/pom.xml b/java/sca/otest/current/ASM_6033/pom.xml deleted file mode 100644 index 4ccba46be5..0000000000 --- a/java/sca/otest/current/ASM_6033/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_6033 - Apache Tuscany SCA Specification Tests ASM_6033 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_7001/pom.xml b/java/sca/otest/current/ASM_7001/pom.xml deleted file mode 100644 index de177ba171..0000000000 --- a/java/sca/otest/current/ASM_7001/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_7001 - Apache Tuscany SCA Specification Tests ASM_7001 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_7007/pom.xml b/java/sca/otest/current/ASM_7007/pom.xml deleted file mode 100644 index 0dbe79ea74..0000000000 --- a/java/sca/otest/current/ASM_7007/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_7007 - Apache Tuscany SCA Specification Tests ASM_7007 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_7008/pom.xml b/java/sca/otest/current/ASM_7008/pom.xml deleted file mode 100644 index 951d37fb2d..0000000000 --- a/java/sca/otest/current/ASM_7008/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_7008 - Apache Tuscany SCA Specification Tests ASM_7008 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_7009/pom.xml b/java/sca/otest/current/ASM_7009/pom.xml deleted file mode 100644 index 876be3db70..0000000000 --- a/java/sca/otest/current/ASM_7009/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_7009 - Apache Tuscany SCA Specification Tests ASM_7009 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_7010/pom.xml b/java/sca/otest/current/ASM_7010/pom.xml deleted file mode 100644 index 67978b4d15..0000000000 --- a/java/sca/otest/current/ASM_7010/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_7010 - Apache Tuscany SCA Specification Tests ASM_7010 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_8001/pom.xml b/java/sca/otest/current/ASM_8001/pom.xml deleted file mode 100644 index 444428a709..0000000000 --- a/java/sca/otest/current/ASM_8001/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_8001 - Apache Tuscany SCA Specification Tests ASM_8001 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_8001_Java/pom.xml b/java/sca/otest/current/ASM_8001_Java/pom.xml deleted file mode 100644 index 4b9bdfea7d..0000000000 --- a/java/sca/otest/current/ASM_8001_Java/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_8001_Java - Apache Tuscany SCA Specification Tests ASM_8001_Java - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_8003/pom.xml b/java/sca/otest/current/ASM_8003/pom.xml deleted file mode 100644 index 3f00031645..0000000000 --- a/java/sca/otest/current/ASM_8003/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_8003 - Apache Tuscany SCA Specification Tests ASM_8003 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_8004/pom.xml b/java/sca/otest/current/ASM_8004/pom.xml deleted file mode 100644 index 6c32a36039..0000000000 --- a/java/sca/otest/current/ASM_8004/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_8004 - Apache Tuscany SCA Specification Tests ASM_8004 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-otests-asm-ASM_8005 - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_8005/pom.xml b/java/sca/otest/current/ASM_8005/pom.xml deleted file mode 100644 index 63551f9dd1..0000000000 --- a/java/sca/otest/current/ASM_8005/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_8005 - Apache Tuscany SCA Specification Tests ASM_8005 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_8010/pom.xml b/java/sca/otest/current/ASM_8010/pom.xml deleted file mode 100644 index 59146c2ea0..0000000000 --- a/java/sca/otest/current/ASM_8010/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_8010 - Apache Tuscany SCA Specification Tests ASM_8010 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_8011/pom.xml b/java/sca/otest/current/ASM_8011/pom.xml deleted file mode 100644 index 35e0f19c81..0000000000 --- a/java/sca/otest/current/ASM_8011/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_8011 - Apache Tuscany SCA Specification Tests ASM_8011 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_8012/pom.xml b/java/sca/otest/current/ASM_8012/pom.xml deleted file mode 100644 index aea8dbedfe..0000000000 --- a/java/sca/otest/current/ASM_8012/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_8012 - Apache Tuscany SCA Specification Tests ASM_8012 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_8017/pom.xml b/java/sca/otest/current/ASM_8017/pom.xml deleted file mode 100644 index a675fe523e..0000000000 --- a/java/sca/otest/current/ASM_8017/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_8017 - Apache Tuscany SCA Specification Tests ASM_8017 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_8019/pom.xml b/java/sca/otest/current/ASM_8019/pom.xml deleted file mode 100644 index edd08983db..0000000000 --- a/java/sca/otest/current/ASM_8019/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_8019 - Apache Tuscany SCA Specification Tests ASM_8019 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/ASM_9002/pom.xml b/java/sca/otest/current/ASM_9002/pom.xml deleted file mode 100644 index 101982a17d..0000000000 --- a/java/sca/otest/current/ASM_9002/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-ASM_9002 - Apache Tuscany SCA Specification Tests ASM_9002 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/Contribution1/pom.xml b/java/sca/otest/current/Contribution1/pom.xml deleted file mode 100644 index 103028b32e..0000000000 --- a/java/sca/otest/current/Contribution1/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-Contribution1 - Apache Tuscany SCA Specification Tests Contribution1 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/Contribution2/pom.xml b/java/sca/otest/current/Contribution2/pom.xml deleted file mode 100644 index e106a56356..0000000000 --- a/java/sca/otest/current/Contribution2/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-Contribution2 - Apache Tuscany SCA Specification Tests Contribution2 - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/General/ASM_8002.odg b/java/sca/otest/current/General/ASM_8002.odg deleted file mode 100644 index 30664d5a37..0000000000 Binary files a/java/sca/otest/current/General/ASM_8002.odg and /dev/null differ diff --git a/java/sca/otest/current/General/pom.xml b/java/sca/otest/current/General/pom.xml deleted file mode 100644 index 4f462c3f12..0000000000 --- a/java/sca/otest/current/General/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-General - Apache Tuscany SCA Specification Tests General - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/General_C/pom.xml b/java/sca/otest/current/General_C/pom.xml deleted file mode 100644 index c7d6e7864a..0000000000 --- a/java/sca/otest/current/General_C/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-General_C - Apache Tuscany SCA Specification Tests ASM General_C - - - ../src/main/resources/General_C - - - ../src/main/resources/General_C - - - ../tests/target/General_C - - diff --git a/java/sca/otest/current/General_CPP/pom.xml b/java/sca/otest/current/General_CPP/pom.xml deleted file mode 100644 index ee026d3217..0000000000 --- a/java/sca/otest/current/General_CPP/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-General_CPP - Apache Tuscany SCA Specification Tests ASM General_CPP - - - ../src/main/resources/General_CPP - - - ../src/main/resources/General_CPP - - - ../tests/target/General_CPP - - diff --git a/java/sca/otest/current/General_Java/pom.xml b/java/sca/otest/current/General_Java/pom.xml deleted file mode 100644 index 95481927a2..0000000000 --- a/java/sca/otest/current/General_Java/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-General_Java - Apache Tuscany SCA Specification Tests General_Java - - - - org.apache.tuscany.sca - tuscany-otests-asm-General - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/README b/java/sca/otest/current/README deleted file mode 100644 index cff0c854ea..0000000000 --- a/java/sca/otest/current/README +++ /dev/null @@ -1,64 +0,0 @@ -Running the otests with Tuscany using Maven -=========================================== - -cd otest/current -mvn - -should build and run all of the otests - -The file otest\current\tests\src\test\resources\oasis-sca-tests.properties configures the -test environment. Currently you can run in either the Java standalone or OSGi runtimes -which is configured by the org.oasis.sca.tests.assembly.runtime_bridge property. - - -Running the otests with Tuscany using Eclipse -============================================= - -cd otest/current -mvn eclipse:eclipse - -import otest/current/tests into eclipse -import otest/current/General into eclipse -import otest/current/General_Java into eclipse - -import which ever other contributions you need into eclipse (depends on which tests you are running) - -Structure of the otests -====================== - -The otest directory, once checked out, contains files from both OASIS and Tuscany svn. As follows - -otest/ - current/ - the latest otests - src/ - the latest otest source pulled directly from OASIS svn via svn:externals - tests/ - the latest otest unit tests pulled directly from OASIS svn via svn:externals - General_Java/ - the general Java contribution pulled from Tuscany svn - src/main/ - the general Java classes pulled directly from OASIS svn via svn:externals - General - the general contribution pulled from Tuscany svn - src/main/resources - code copied from otest/current/src/resources/General - ASM_**** - src/main/resources - code copied from otest/current/src/resources/AMS_**** - these independent contributions are contributions with - errors in them. The rest of the top-level otest contributions - can be found in General - -The code is copied from src/main/resources to the appropriate contribution each -time maven is used to compile the contribution in question. There is a build setting -in each contribution pom that does the copy. - -This all seems a bit complicated but is structured like this because the OASIS tests -don't come with a build system. We want to be able to build in both maven and eclipse -in the same way as we do with the rest of our code - -You will note that there are a lot of contributions and it would seem to be a big job -if we need to make changes to the build across all the contributions. However there -is an ant script that sets up the contribution modules. - -otest/current/ant fixUpContributions - -Creates the src/main/resource directory and copies in the pom from the template-pom.xml file - - -Extra dependencies that are required - -ASM_8004 -> ASM_8005 diff --git a/java/sca/otest/current/build.xml b/java/sca/otest/current/build.xml deleted file mode 100644 index 1ebfe83b66..0000000000 --- a/java/sca/otest/current/build.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/pom.xml b/java/sca/otest/current/pom.xml deleted file mode 100644 index 1020f5e198..0000000000 --- a/java/sca/otest/current/pom.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests - Apache Tuscany SCA Specification Tests Assembly Unit tests - - pom - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-feature-api - pom - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-feature-core - pom - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-feature-webservice - pom - 2.0-SNAPSHOT - - - - junit - junit - 4.5 - test - - - - - - General - General_Java - ASM_4002 - ASM_4003 - ASM_4004 - ASM_4007 - ASM_5004 - ASM_5005 - ASM_5007 - ASM_5009 - ASM_5023 - ASM_5024 - ASM_5027 - ASM_5030 - ASM_5035 - ASM_6001 - ASM_6002 - ASM_6003 - ASM_6005 - ASM_6006 - ASM_6008 - ASM_6012 - ASM_6021 - ASM_6022 - ASM_6025 - ASM_6028 - ASM_6029 - ASM_6031 - ASM_6032 - ASM_6033 - ASM_7001 - ASM_7007 - ASM_7008 - ASM_7009 - ASM_7010 - ASM_8001 - ASM_8001_Java - ASM_8003 - ASM_8004 - ASM_8005 - ASM_8010 - ASM_8011 - ASM_8012 - ASM_8017 - ASM_8019 - ASM_9002 - ASM_10001 - ASM_10003 - ASM_12001 - ASM_12002 - ASM_12003 - ASM_12005 - ASM_12007 - ASM_12008 - ASM_12009 - ASM_12010 - ASM_12012 - ASM_12013 - ASM_13001 - ASM_13002 - ASM_13003 - ASM_13004 - ASM_13005 - ASM_13006 - ASM_13007 - ASM_13008 - Contribution1 - Contribution2 - tests - - - diff --git a/java/sca/otest/current/template-pom.xml b/java/sca/otest/current/template-pom.xml deleted file mode 100644 index 115cb4576a..0000000000 --- a/java/sca/otest/current/template-pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-otests - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-@ASM@ - Apache Tuscany SCA Specification Tests @ASM@ - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/current/tests/pom.xml b/java/sca/otest/current/tests/pom.xml deleted file mode 100644 index ac7871db61..0000000000 --- a/java/sca/otest/current/tests/pom.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-tests - Apache Tuscany SCA Specification Tests - - - - org.apache.tuscany.sca - tuscany-node-impl - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-node-impl-osgi - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-otests-asm-General - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-otests-asm-General_Java - 2.0-SNAPSHOT - - - - javax.servlet - servlet-api - 2.5 - - - - com.sun.xml.ws - jaxws-rt - 2.1.7 - - - - junit - junit - 4.5 - test - - - - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.3 - - - add-test-source - generate-sources - - add-test-source - - - - src/main/ttest - src/main/tests - - - - - - - - diff --git a/java/sca/otest/current/tests/src/main/resources/oasis-sca-tests-errors.properties b/java/sca/otest/current/tests/src/main/resources/oasis-sca-tests-errors.properties deleted file mode 100644 index ddc07053da..0000000000 --- a/java/sca/otest/current/tests/src/main/resources/oasis-sca-tests-errors.properties +++ /dev/null @@ -1,19 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -ASM_10001=Duplicate intent {http://docs.oasis-open.org/ns/opencsa/scatests/200903}Fred found in domain - diff --git a/java/sca/otest/current/tests/src/main/resources/oasis-sca-tests.properties b/java/sca/otest/current/tests/src/main/resources/oasis-sca-tests.properties deleted file mode 100644 index 07542a4ec7..0000000000 --- a/java/sca/otest/current/tests/src/main/resources/oasis-sca-tests.properties +++ /dev/null @@ -1,32 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# 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 - -# The class to use as the Runtime Bridge for the SCA runtime under test -# - use client.TuscanyRuntimeBridge for the OSGi runtime -# - use tuscany.TuscanyRuntimeBridge for the Java runtime -# org.oasis.sca.tests.assembly.runtime_bridge=client.TuscanyRuntimeBridge -org.oasis.sca.tests.assembly.runtime_bridge=org.apache.tuscany.sca.otest.TuscanyRuntimeBridge - -# 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=../%1/target/tuscany-otests-asm-%1.jar - diff --git a/java/sca/otest/current/tests/src/main/ttest/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java b/java/sca/otest/current/tests/src/main/ttest/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java deleted file mode 100644 index d0290ffdb7..0000000000 --- a/java/sca/otest/current/tests/src/main/ttest/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.otest; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.equinox.launcher.Contribution; -import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper; -import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher; - -import client.RuntimeBridge; -import client.TestConfiguration; - - -/** - * An implementation of the Runtime Bridge for the Apache Tuscany SCA runtime (version 2.x) - * - */ -public class TuscanyOSGiRuntimeBridge implements RuntimeBridge { - - static final String CONTRIBUTION_LOCATION_PROPKEY = "OASIS_TESTENV_CONTRIBUTION_LOCATION"; - - protected NodeLauncher launcher; - protected Node node; - TestConfiguration testConfiguration = null; - - public TuscanyOSGiRuntimeBridge() { - - } - - public TestConfiguration getTestConfiguration() { - return testConfiguration; - } - - public void setTestConfiguration(TestConfiguration testConfiguration) { - this.testConfiguration = testConfiguration; - } - - public boolean startContribution(String contributionLocation, String[] contributionNames) throws Exception { - try { - // Tuscany specific code which starts the contribution(s) holding the test - launcher = NodeLauncher.newInstance(); - - Contribution[] contributions = new Contribution[contributionNames.length]; - String[] contributionURIs = getContributionURIs(contributionLocation); - for (int i = 0; i < contributions.length; i++) { - contributions[i] = new Contribution(contributionNames[i], contributionURIs[i]); - } // end for - - node = launcher.createNode(testConfiguration.getComposite(), contributions); - System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader()); - // Start the node - node.start(); - } catch (Exception e) { - System.out.println(e.getMessage()); - e.printStackTrace(); - throw e; - } // end try - - return true; - } // end method startContribution - - /** - * Gets the location of the Contributions as URIs - * @param contributionLocation - a location pattern URI, which contains one or more "%1" - * substrings, which are substituted with the name of the contribution to get the URI of - * the contribution - * @return the contribution locations as an array of Strings - */ - protected String[] getContributionURIs(String contributionLocation) throws Exception { - String[] locations; - locations = testConfiguration.getContributionNames(); - - if (locations != null && contributionLocation != null) { - - for (int i = 0; i < locations.length; i++) { - String aLocation = contributionLocation.replaceAll("%1", locations[i]); - - locations[i] = aLocation; - } // end for - } else { - if (locations == null) { - // No contribution specified - throw an Exception - throw new Exception("Unable to start SCA runtime - no contribution supplied - error"); - } else { - // No contribution location supplied - throw an Exception - throw new Exception("Unable to start SCA runtime - no contribution location supplied - error"); - } // end if - } // end if - - return locations; - } // end getContributionURI - - public void stopContribution() { - if (node != null) { - node.stop(); - node.destroy(); - } // end if - if (launcher != null) { - launcher.destroy(); - } // end if - } // end method stopContribution - - public String getContributionLocation(Class testClass) { - return ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass()); - } // end method getContributionLocation - - public boolean checkError(String testName, Throwable exception) { - // TODO Auto-generated method stub - return true; - } - -} // end class TuscanyRuntimeBridge diff --git a/java/sca/otest/current/tests/src/main/ttest/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java b/java/sca/otest/current/tests/src/main/ttest/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java deleted file mode 100644 index 98aaa2ef7b..0000000000 --- a/java/sca/otest/current/tests/src/main/ttest/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.otest; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -import client.RuntimeBridge; -import client.TestConfiguration; - -/** - * An implementation of the Runtime Bridge for the Apache Tuscany SCA runtime (version 2.x) - * - */ -public class TuscanyRuntimeBridge implements RuntimeBridge { - - static final String CONTRIBUTION_LOCATION_PROPKEY = "OASIS_TESTENV_CONTRIBUTION_LOCATION"; - - protected NodeFactory launcher; - protected Node node; - protected Properties expectedErrorMessages; - - TestConfiguration testConfiguration = null; - - public TuscanyRuntimeBridge() { - // read test error mapping - expectedErrorMessages = new Properties(); - try { - InputStream propertiesStream = this.getClass().getResourceAsStream("/oasis-sca-tests-errors.properties"); - expectedErrorMessages.load(propertiesStream); - } catch (IOException e) { - System.out.println("Unable to read oasis-sca-tests-errors.properties file"); - } - } - - public TestConfiguration getTestConfiguration() { - return testConfiguration; - } - - public void setTestConfiguration(TestConfiguration testConfiguration) { - this.testConfiguration = testConfiguration; - } - - public boolean startContribution(String contributionLocation, String[] contributionNames) throws Exception { - try { - // Tuscany specific code which starts the contribution(s) holding the test - launcher = NodeFactory.newInstance(); - - Contribution[] contributions = new Contribution[contributionNames.length]; - String[] contributionURIs = getContributionURIs(contributionLocation); - for (int i = 0; i < contributions.length; i++) { - contributions[i] = new Contribution(contributionNames[i], contributionURIs[i]); - } // end for - - node = launcher.createNode(testConfiguration.getComposite(), contributions); - // Start the node - node.start(); - } catch (Exception e) { - System.out.println(e.getMessage()); - e.printStackTrace(); - throw e; - } // end try - - return true; - } // end method startContribution - - /** - * Gets the location of the Contributions as URIs - * @param contributionLocation - a location pattern URI, which contains one or more "%1" - * substrings, which are substituted with the name of the contribution to get the URI of - * the contribution - * @return the contribution locations as an array of Strings - */ - protected String[] getContributionURIs(String contributionLocation) throws Exception { - String[] locations; - locations = testConfiguration.getContributionNames(); - - if (locations != null && contributionLocation != null) { - - for (int i = 0; i < locations.length; i++) { - String aLocation = contributionLocation.replaceAll("%1", locations[i]); - - locations[i] = aLocation; - } // end for - } else { - if (locations == null) { - // No contribution specified - throw an Exception - throw new Exception("Unable to start SCA runtime - no contribution supplied - error"); - } else { - // No contribution location supplied - throw an Exception - throw new Exception("Unable to start SCA runtime - no contribution location supplied - error"); - } // end if - } // end if - - return locations; - } // end getContributionURI - - public void stopContribution() { - if (node != null) { - node.stop(); - node.destroy(); - } // end if - if (launcher != null) { - launcher.destroy(); - } // end if - } // end method stopContribution - - public String getContributionLocation(Class testClass) { - return ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass()); - } // end method getContributionLocation - - public boolean checkError(String testName, Throwable ex){ - String expectedMessage = expectedErrorMessages.getProperty(testName); - String receivedMessage = ex.getMessage(); - - if (expectedMessage == null){ - System.out.println("Null expected error message for test " + testName); - System.out.println("Please add message to oasis-sca-tests-errors.properties"); - return false; - } - - if (receivedMessage == null){ - System.out.println("Null received error message for test " + testName); - return false; - } - - int messageStart = receivedMessage.indexOf("] - "); - - if (messageStart < 0){ - System.out.println("Message separator not found for test " + testName); - } - - receivedMessage = receivedMessage.substring(messageStart + 4); - - if (receivedMessage.startsWith(expectedMessage)){ - return true; - } else { - return false; - } - } - -} // end class TuscanyRuntimeBridge diff --git a/java/sca/otest/current/tests/src/test/resources/oasis-sca-tests.properties b/java/sca/otest/current/tests/src/test/resources/oasis-sca-tests.properties deleted file mode 100644 index c02f116ccd..0000000000 --- a/java/sca/otest/current/tests/src/test/resources/oasis-sca-tests.properties +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. -# OASIS trademark, IPR and other policies apply. -# - -# 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 - -# The class to use as the Runtime Bridge for the SCA runtime under test -# - use client.TuscanyRuntimeBridge for the OSGi runtime -# - use tuscany.TuscanyRuntimeBridge for the Java runtime -# org.oasis.sca.tests.assembly.runtime_bridge=client.TuscanyRuntimeBridge -org.oasis.sca.tests.assembly.runtime_bridge=org.apache.tuscany.sca.otest.TuscanyRuntimeBridge - -# 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=../%1/target/tuscany-otests-asm-%1.jar - diff --git a/java/sca/otest/newlayout/README b/java/sca/otest/newlayout/README deleted file mode 100644 index 6b2588a658..0000000000 --- a/java/sca/otest/newlayout/README +++ /dev/null @@ -1,68 +0,0 @@ -Running the otests with Tuscany using Maven -=========================================== - -To get the OASIS compliance tests from SVN: - -svn co https://svn.apache.org/repos/asf/tuscany/java/sca/otest/newlayout/ otests - -To run the tests: - -cd otest/newlayout -mvn - -should build and run all of the Assembly spec otests - -mvn -Pscajcaa - -should build and run all of the SCA-J CAA spec otests - -The file otest\newlayout\tuscany-test-runner\src\test\resources\oasis-sca-tests.properties configures the -test environment. Currently you can run in either the Java standalone or OSGi runtimes -which is configured by the org.oasis.sca.tests.assembly.runtime_bridge property. - -Running the otests with Tuscany using Eclipse -============================================= - -For the Assembly tests: - -cd otest/newlayout -mvn eclipse:eclipse - -import otest/newlayout/tuscany-test-runner into eclipse -import otest/newlayout/sca-assembly/General into eclipse -import otest/newlayout/sca-assembly/General_Java into eclipse - -import which ever other contributions you need into eclipse (depends on which tests you are running) - -For the SCA-J CAA tests: - -mvn -Pscajcaa eclipse:eclipse - -import otest/newlayout/tuscany-java-caa-test-runner into eclipse -import otest/newlayout/sca-java-caa into eclipse - - - -Structure of the otests -====================== - -The otest directory, once checked out, contains files from both OASIS and Tuscany svn. As follows - -otest/ - newlayout/ - the latest otests - tuscany-test-runner - the tuscany specific code + code copied from sca-assembly/Test_Client - sca-assembly/ - the Assembly otest source pulled directly from OASIS svn via svn:externals - sca-java-caa/ - the SCA-J CAA otest source pulled directly from OASIS svn via svn:externals - tuscany-java-caa-test-runner - the tuscany specific code + code for running the SCA-J CAA tests - -The Junit test cases are copied, using an ant script called by maven, from sca-assembly/Test_Client -into tuscany-test-runner so that we can overlay them with Tuscany specific bridges and property -files. In particular the Tuscany version of the test property files can be found at - -tuscany-test-runner/src/test/resources/ - -Maven puts this on the classpath before - -tuscany-test-runner/src/main/resources - -Which is where the otest versions get copied to and hence the Tuscany ones get picked up. diff --git a/java/sca/otest/newlayout/build.xml b/java/sca/otest/newlayout/build.xml deleted file mode 100644 index 839e205082..0000000000 --- a/java/sca/otest/newlayout/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/otest/newlayout/pom.xml b/java/sca/otest/newlayout/pom.xml deleted file mode 100644 index 82d61ab19a..0000000000 --- a/java/sca/otest/newlayout/pom.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests - OASIS SCA Specification Tests - pom - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-feature-api - pom - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-feature-core - pom - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-feature-webservice - pom - 2.0-SNAPSHOT - - - - junit - junit - 4.5 - test - - - - - - - default - - true - - - sca-assembly - tuscany-test-runner - - - - - scajcaa - - sca-java-caa - tuscany-java-caa-test-runner - - - - - - diff --git a/java/sca/otest/newlayout/tuscany-java-caa-test-runner/pom.xml b/java/sca/otest/newlayout/tuscany-java-caa-test-runner/pom.xml deleted file mode 100644 index fc1ce3eccb..0000000000 --- a/java/sca/otest/newlayout/tuscany-java-caa-test-runner/pom.xml +++ /dev/null @@ -1,183 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-sca-j-caa-tests - Apache Tuscany SCA Specification Tests for SCA-J CAA - - - - org.apache.tuscany.sca - tuscany-node-impl - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-node-launcher-equinox - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-deployment - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-host-jetty - 2.0-SNAPSHOT - - - - javax.servlet - servlet-api - 2.5 - - - - com.sun.xml.ws - jaxws-rt - 2.1.7 - - - - junit - junit - 4.5 - test - - - - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.3 - - - add-test-source - generate-sources - - add-test-source - - - - src/test/tjava - - - - - - - - diff --git a/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/resources/oasis-sca-tests.properties b/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/resources/oasis-sca-tests.properties deleted file mode 100644 index 9bd40612ee..0000000000 --- a/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/resources/oasis-sca-tests.properties +++ /dev/null @@ -1,30 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# 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=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 -org.oasis.sca.tests.assembly.runtime_bridge=org.apache.tuscany.sca.otest.TuscanyRuntimeBridge - -# 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-java-caa/%1/target/%1.zip - diff --git a/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties b/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties deleted file mode 100644 index c76ed8cfff..0000000000 --- a/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties +++ /dev/null @@ -1,56 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -JCA_2001=org.apache.tuscany.sca.interfacedef.OverloadedOperationException: Cannot overload operation operation1 on org.oasisopen.sca.test.Service1Overload as it is a @Remotable interface -JCA_3001=org.oasisopen.sca.ServiceRuntimeException: [Contribution: JCA_3001, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_JCA_3001] - Class Not Found Exception: Service1 -JCA_3002=org.oasisopen.sca.ServiceRuntimeException: [Contribution: JCA_3002, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_JCA_3002] - Class Not Found Exception: Service1 -JCA_3003=org.oasisopen.sca.ServiceRuntimeException: [Contribution: JCA_3003, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_JCA_3003] - Class Not Found Exception: Service3Callback -JCA_3004=org.oasisopen.sca.ServiceRuntimeException: [Contribution: JCA_3004, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_JCA_3004] - Class Not Found Exception: Service3Callback -JCA_3006=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TEST_JCA_3006Component2] - Component service interface incompatible with implementation service interface: Component = TEST_JCA_3006Component2 Service = Service3WithCallback Callback operation not found on target -JCA_3007=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TEST_JCA_3007Component1] - Component reference interface incompatible with implementation reference interface: Component = TEST_JCA_3007Component1 Reference = reference1 Callback operation not found on target -JCA_3008=org.oasisopen.sca.ServiceRuntimeException: [Contribution: JCA_3008, Artifact: Test_JCA_3008.composite] - XMLSchema validation error occured in: Test_JCA_3008.composite ,line = 30, column = 13, Message = cvc-complex-type.3.2.2: Attribute 'oops' is not allowed to appear in element 'interface.java'. -JCA_3009=org.apache.tuscany.sca.interfacedef.InvalidAnnotationException: @Remotable annotation present in a interface marked as not remotable in the SCDL -JCA_3011=org.oasisopen.sca.ServiceRuntimeException: [Contribution: JCA_3011, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_JCA_3011] - JCA30006 Forbidden annotation interface org.oasisopen.sca.annotation.Property found in class org.oasisopen.sca.test.JCA3011Service -JCA_3012=org.oasisopen.sca.ServiceRuntimeException: [Contribution: JCA_3012, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_JCA_3012] - JCA30007 Forbidden annotation interface org.oasisopen.sca.annotation.Property found in class org.oasisopen.sca.test.JCA3012Service3Callback -JCA_10001=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.IllegalPropertyException: Argument 1 of method operation1 in class class org.oasisopen.sca.test.service1BadAnnotation can not be a Property -JCA_10002=org.oasisopen.sca.ServiceRuntimeException: [Contribution: JCA_10002, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_JCA_10002] - JCA9002 SCA annotations are not permitted on static members: org.oasisopen.sca.test.service1Sta -JCA_10003=org.oasisopen.sca.ServiceRuntimeException: [Contribution: JCA_10003, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_JCA_10003] - JCA9002 SCA annotations are not permitted on static members: org.oasisopen.sca.test.service1Sta -JCA_10004=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.IllegalCallbackReferenceException: JCA90046 @Callback on field of method must not have any parameters -JCA_10006=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.InvalidConstructorException: JCA90003 constructor parameters must have @Property or @Reference annotation -JCA_10007=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.IllegalDestructorException: Destructor must not have argments -JCA_10008=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.IllegalInitException: Initializer must not have argments -JCA_10009=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.IllegalPropertyException: Final field serviceName in class org.oasisopen.sca.test.service1BadPropImpl can not be annotated as a Property -JCA_10010=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.InvalidPropertyException: Missing property name: public org.oasisopen.sca.test.service1ConstrBadPropImpl(java.lang.String)[0] -JCA_10011=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.InvalidPropertyException: JCA_90014 Constructor property must not have required=false: org.oasisopen.sca.test.service1ConstrBadPropImpl -JCA_10014=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.InvalidReferenceException: JCA90018 @Reference in a Constructor must have a name attributeorg.oasisopen.sca.test.service1ConstrBad -JCA_10015=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.InvalidReference -JCA_10046=org.oasisopen.sca.ServiceRuntimeException: [Contribution: JCA_General_Java] - Exception while generating WSDL: -JCA_10047=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.IntrospectionException: JCA90041 @Scope annotation not allowed on service interface -JCA_10048=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.IntrospectionException: JCA???? Implementation missing service method operation2 service interface org.oasisopen.sca.test.Service1Superset -JCA_10049=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.IntrospectionException: JCA90050 The number of Strings in the names attribute array of the @Service annotation MUST match the number of elements in the value attribute array -JCA_10050=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TEST_JCA_10050Component1] - Duplicate service name: Component = TEST_JCA_10050Component1 Service = Service1 -JCA_10051=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.IntrospectionException: JCA90059 The array of interfaces or classes specified by the value attribute of the @Service annotation -JCA_10052=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.IntrospectionException: JCA90060 The value of each element in the @Service names array MUST be unique amongst all the other element values in the array -JCA_11005=* org.apache.tuscany.sca.contribution.processor.ContributionReadException: java.io.FileNotFoundException: C:TuscanySVN2.x-trunkotestnewlayouttuscany-java-caa-test-runner..sca-java-caaJCA_11005targetJCA_11005.zip (The system cannot find the path specified) -# Intent and PolicySet related tests -JCA_8001=[POL40009] Intent {http://docs.oasis-open.org/ns/opencsa/scatests/200903}testIntent2 and {http://docs.oasis-open.org/ns/opencsa/scatests/200903}testIntent1 are mutually exclusive -JCA_8002=Method that is not an SCA reference cannot have policySet/intent annotations -JCA_8003=Field that is not an SCA reference cannot have policySet/intent annotations -JCA_8004=Constructor parameter that is not an SCA reference cannot have policySet/intent annotations -JCA_8006=[POL40009] Intent {http://docs.oasis-open.org/ns/opencsa/scatests/200903}testIntent2 and {http://docs.oasis-open.org/ns/opencsa/scatests/200903}testIntent1 are mutually exclusive -JCA_8008=Method that is not an SCA reference cannot have policySet/intent annotations -JCA_8009=Field that is not an SCA reference cannot have policySet/intent annotations -JCA_8010=Constructor parameter that is not an SCA reference cannot have policySet/intent annotations diff --git a/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java b/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java deleted file mode 100644 index afea19fe0b..0000000000 --- a/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.otest; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.equinox.launcher.Contribution; -import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper; -import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher; - -import client.RuntimeBridge; -import client.TestConfiguration; - - -/** - * An implementation of the Runtime Bridge for the Apache Tuscany SCA runtime (version 2.x) - * - */ -public class TuscanyOSGiRuntimeBridge implements RuntimeBridge { - - static final String CONTRIBUTION_LOCATION_PROPKEY = "OASIS_TESTENV_CONTRIBUTION_LOCATION"; - - protected NodeLauncher launcher; - protected Node node; - TestConfiguration testConfiguration = null; - protected Properties expectedErrorMessages; - - public TuscanyOSGiRuntimeBridge() { - // read test error mapping - expectedErrorMessages = new Properties(); - try { - InputStream propertiesStream = this.getClass().getResourceAsStream("/tuscany-oasis-sca-tests-errors.properties"); - expectedErrorMessages.load(propertiesStream); - } catch (IOException e) { - System.out.println("Unable to read oasis-sca-tests-errors.properties file"); - } - } - - public TestConfiguration getTestConfiguration() { - return testConfiguration; - } - - public void setTestConfiguration(TestConfiguration testConfiguration) { - this.testConfiguration = testConfiguration; - } - - public boolean startContribution(String contributionLocation, String[] contributionNames) throws Exception { - try { - // Tuscany specific code which starts the contribution(s) holding the test - launcher = NodeLauncher.newInstance(); - - Contribution[] contributions = new Contribution[contributionNames.length]; - String[] contributionURIs = getContributionURIs(contributionLocation); - for (int i = 0; i < contributions.length; i++) { - contributions[i] = new Contribution(contributionNames[i], contributionURIs[i]); - } // end for - - node = launcher.createNode(testConfiguration.getComposite(), contributions); - System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader()); - // Start the node - node.start(); - } catch (Exception e) { - System.out.println(e.getMessage()); - e.printStackTrace(); - throw e; - } // end try - - return true; - } // end method startContribution - - /** - * Gets the location of the Contributions as URIs - * @param contributionLocation - a location pattern URI, which contains one or more "%1" - * substrings, which are substituted with the name of the contribution to get the URI of - * the contribution - * @return the contribution locations as an array of Strings - */ - protected String[] getContributionURIs(String contributionLocation) throws Exception { - String[] locations; - locations = testConfiguration.getContributionNames(); - - if (locations != null && contributionLocation != null) { - - for (int i = 0; i < locations.length; i++) { - String aLocation = contributionLocation.replaceAll("%1", locations[i]); - - locations[i] = aLocation; - } // end for - } else { - if (locations == null) { - // No contribution specified - throw an Exception - throw new Exception("Unable to start SCA runtime - no contribution supplied - error"); - } else { - // No contribution location supplied - throw an Exception - throw new Exception("Unable to start SCA runtime - no contribution location supplied - error"); - } // end if - } // end if - - return locations; - } // end getContributionURI - - public void stopContribution() { - if (node != null) { - node.stop(); - node.destroy(); - } // end if - if (launcher != null) { - launcher.destroy(); - } // end if - } // end method stopContribution - - public String getContributionLocation(Class testClass) { - return ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass()); - } // end method getContributionLocation - - public void checkError(String testName, Throwable ex) throws Throwable { - String expectedMessage = expectedErrorMessages.getProperty(testName); - String receivedMessage = ex.getMessage(); - - if (expectedMessage == null){ - fail("Null expected error message for test " + testName + - "Please add message to oasis-sca-tests-errors.properties"); - } - - if (receivedMessage == null){ - fail("Null received error message for test " + testName); - } - - int messageStart = receivedMessage.indexOf("] - "); - - if (messageStart < 0){ - fail("Message separator not found for test " + testName); - } - - receivedMessage = receivedMessage.substring(messageStart + 4); - - assertEquals( expectedMessage, receivedMessage ); - - return; - } - -} // end class TuscanyRuntimeBridge diff --git a/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java b/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java deleted file mode 100644 index fa4f6f6dd4..0000000000 --- a/java/sca/otest/newlayout/tuscany-java-caa-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java +++ /dev/null @@ -1,208 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.otest; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.io.BufferedWriter; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -import client.RuntimeBridge; -import client.TestConfiguration; - -/** - * An implementation of the Runtime Bridge for the Apache Tuscany SCA runtime (version 2.x) - * - */ -public class TuscanyRuntimeBridge implements RuntimeBridge { - - static final String CONTRIBUTION_LOCATION_PROPKEY = "OASIS_TESTENV_CONTRIBUTION_LOCATION"; - - protected NodeFactory launcher; - protected Node node; - protected Properties expectedErrorMessages; - - TestConfiguration testConfiguration = null; - - public TuscanyRuntimeBridge() { - // read test error mapping - expectedErrorMessages = new Properties(); - try { - InputStream propertiesStream = this.getClass().getResourceAsStream("/tuscany-oasis-sca-tests-errors.properties"); - expectedErrorMessages.load(propertiesStream); - } catch (IOException e) { - System.out.println("Unable to read oasis-sca-tests-errors.properties file"); - } - } - - public TestConfiguration getTestConfiguration() { - return testConfiguration; - } - - public void setTestConfiguration(TestConfiguration testConfiguration) { - this.testConfiguration = testConfiguration; - } - - public boolean startContribution(String contributionLocation, String[] contributionNames) throws Exception { - try { - // Tuscany specific code which starts the contribution(s) holding the test - launcher = NodeFactory.newInstance(); - - Contribution[] contributions = new Contribution[contributionNames.length]; - String[] contributionURIs = getContributionURIs(contributionLocation); - for (int i = 0; i < contributions.length; i++) { - contributions[i] = new Contribution(contributionNames[i], contributionURIs[i]); - } // end for - - node = launcher.createNode(testConfiguration.getComposite(), contributions); - // Start the node - node.start(); - - // For debugging - // print out the composites that have been read in success cases - // System.out.println(((NodeImpl)node).dumpDomainComposite()); - } catch (Exception e) { - System.out.println(e.getMessage()); - e.printStackTrace(); - throw e; - } // end try - - return true; - } // end method startContribution - - /** - * Gets the location of the Contributions as URIs - * @param contributionLocation - a location pattern URI, which contains one or more "%1" - * substrings, which are substituted with the name of the contribution to get the URI of - * the contribution - * @return the contribution locations as an array of Strings - */ - protected String[] getContributionURIs(String contributionLocation) throws Exception { - String[] locations; - locations = testConfiguration.getContributionNames(); - - if (locations != null && contributionLocation != null) { - - for (int i = 0; i < locations.length; i++) { - String aLocation = contributionLocation.replaceAll("%1", locations[i]); - - locations[i] = aLocation; - } // end for - } else { - if (locations == null) { - // No contribution specified - throw an Exception - throw new Exception("Unable to start SCA runtime - no contribution supplied - error"); - } else { - // No contribution location supplied - throw an Exception - throw new Exception("Unable to start SCA runtime - no contribution location supplied - error"); - } // end if - } // end if - - return locations; - } // end getContributionURI - - public void stopContribution() { - if (node != null) { - node.stop(); - node.destroy(); - } // end if - if (launcher != null) { - launcher.destroy(); - } // end if - } // end method stopContribution - - public String getContributionLocation(Class testClass) { - return ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass()); - } // end method getContributionLocation - - public void checkError(String testName, Throwable ex) throws Throwable { - - String expectedMessage = expectedErrorMessages.getProperty(testName); - String receivedMessage = ex.getMessage(); - - if (expectedMessage == null){ - writeMissingMessage(testName, ex); - fail("Null expected error message for test " + testName + - "Please add message to oasis-sca-tests-errors.properties"); - } // end if - - if (receivedMessage == null){ - ex.printStackTrace(); - fail("Null received error message for test " + testName); - } // end if - - if (expectedMessage.startsWith("*")) { - // allow using * to ignore a message comparison - return; - } - - // Deal with the case where the end of the message is variable (eg contains absolute filenames) - // and where the only relevant part is the start of the message - in this case the expected - // message only contains the stem section which is unchanging... - if( receivedMessage.length() > expectedMessage.length() ) { - if (receivedMessage.contains(expectedMessage)) { - return; - } else { - receivedMessage = receivedMessage.substring(0, expectedMessage.length() ); - } - return; - } // end if - - if (!expectedMessage.equals(receivedMessage)) { - writeIncorrectMessage(testName, expectedMessage, receivedMessage); - } - - assertEquals( expectedMessage, receivedMessage ); - - return; - - } - - protected void writeMissingMessage(String testName, Throwable ex) { - try { - BufferedWriter out = new BufferedWriter(new FileWriter("target/OTestMissingMsgs.txt", true)); - out.write(testName + "=* " + ex.getMessage()); - out.newLine(); - out.close(); - } catch (IOException e) { - } - } - - protected void writeIncorrectMessage(String testName, String expected, String received) { - try { - BufferedWriter out = new BufferedWriter(new FileWriter("target/OTestIncorrectMsgs.txt", true)); - out.write(testName); out.newLine(); - out.write(" " + expected); out.newLine(); - out.write(" " + received); out.newLine(); - out.close(); - } catch (IOException e) { - } - } - -} // end class TuscanyRuntimeBridge diff --git a/java/sca/otest/newlayout/tuscany-test-runner/pom.xml b/java/sca/otest/newlayout/tuscany-test-runner/pom.xml deleted file mode 100644 index 286e28abb3..0000000000 --- a/java/sca/otest/newlayout/tuscany-test-runner/pom.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 2.0-SNAPSHOT - ../pom.xml - - tuscany-otests-asm-tests - Apache Tuscany SCA Specification Tests - - - - org.apache.tuscany.sca - tuscany-node-impl - 2.0-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-deployment - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-node-impl-osgi - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-node-launcher - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-node-launcher-equinox - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-host-jetty - 2.0-SNAPSHOT - - - - org.oasis-open.sca.assembly - General_Java - 1.0 - - - - javax.servlet - servlet-api - 2.5 - - - - com.sun.xml.ws - jaxws-rt - 2.1.7 - - - - junit - junit - 4.5 - test - - - - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-files-from-svn - generate-resources - - run - - - - - - - - - - - - - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.3 - - - add-test-source - generate-sources - - add-test-source - - - - src/test/tjava - - - - - - - - diff --git a/java/sca/otest/newlayout/tuscany-test-runner/src/test/resources/oasis-sca-tests.properties b/java/sca/otest/newlayout/tuscany-test-runner/src/test/resources/oasis-sca-tests.properties deleted file mode 100644 index 880a23c53d..0000000000 --- a/java/sca/otest/newlayout/tuscany-test-runner/src/test/resources/oasis-sca-tests.properties +++ /dev/null @@ -1,30 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# 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 - -# 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 -org.oasis.sca.tests.assembly.runtime_bridge=org.apache.tuscany.sca.otest.TuscanyRuntimeBridge - -# 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 - diff --git a/java/sca/otest/newlayout/tuscany-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties b/java/sca/otest/newlayout/tuscany-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties deleted file mode 100644 index 948070cf16..0000000000 --- a/java/sca/otest/newlayout/tuscany-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties +++ /dev/null @@ -1,86 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -ASM_4002=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Duplicate service name: Component = TestComponent1 Service = Service1 -ASM_4003=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Duplicate reference name: Component = TestComponent1 Reference = Reference1 -ASM_4004=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Duplicate property name: Component = TestComponent1 Property = propertyName -ASM_4007=org.apache.tuscany.sca.contribution.processor.ContributionReadException: Error: property has both @type and @element attribute values - propertyName -ASM_4008=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - [ASM_4008] No value configured on a mustSupply property: Component = TestComponent1 Property = propertyName -ASM_5004=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestClient] - Too many targets on reference: reference1 -ASM_5005=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Duplicate service name: Component = TestComponent1 Service = Service1 -ASM_5006=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Component type service not found for component service (missing @Remotable annotation?): Component = TestComponent1 Service = InvalidName -ASM_5007=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Duplicate reference name: Component = TestComponent1 Reference = Reference1 -ASM_5008=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Component type reference not found for component reference: Component = TestComponent1 Reference = InvalidName -ASM_5009=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}] - Duplicate component name: Composite = {http://docs.oasis-open.org/ns/opencsa/sca/200903} Component = TestComponent1 -ASM_5010=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Component service interface incompatible with implementation service interface: Component = TestComponent1 Service = Service1 -ASM_5014=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Component reference multiplicity incompatible with reference multiplicity: Component = TestComponent1 Reference = Reference1 -ASM_5023=OASIS issue opened -ASM_5024=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1, Reference: Reference1] - Composite {http://docs.oasis-open.org/ns/opencsa/sca/200903} Component TestComponent1 Reference Reference1 must not specify endpoints using both target attribute and with binding uri attribute -ASM_5027=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Duplicate component property name: Component = TestComponent1 Property = serviceName -ASM_5028=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Property not found for component property: Component = TestComponent1 Property = randomName -ASM_5029=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - The property component TestComponent1 property complexType has many values but its "many" attribute is set to false -ASM_5030=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_5030, Artifact: Test_ASM_5030.composite] - ASM50033: value attribute exists for the property element -ASM_5035=org.apache.tuscany.sca.contribution.processor.ContributionReadException: Error: property has both @type and @element attribute values - complexType -ASM_5036=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TEST_ASM_5036Component1] - [ASM_5036] The property component TEST_ASM_5036Component1 property complexType has XSD type {http://docs.oasis-open.org/ns/opencsa/scatests/200903}ComplexType2 while its component type property has the XSD type {http://docs.oasis-open.org/ns/opencsa/scatests/200903}ComplexType1 -ASM_5037=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TEST_ASM_5037Component1] - Property not found for component property: Component = TEST_ASM_5037Component1 Property = bogusName -ASM_6001=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_6001, Artifact: TestDuplicate1.composite] - [ASM_6001] More than one composite with the same name {http://docs.oasis-open.org/ns/opencsa/scatests/200903}DuplicateComposite found in contribution -ASM_6002=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Duplicate service name: Component = TestComponent1 Service = Service1 -ASM_6003=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite17] - Promoted component service not found: Composite = {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite17 Service = SpuriousComponent/SpuriousService -ASM_6005=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Duplicate reference name: Component = TestComponent1 Reference = Reference1 -ASM_6006=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite20] - Promoted component reference not found: Composite = {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite20 Reference = Composite20Componentz/Reference1 -ASM_6008=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TEST_ASM_6008Component1, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite22] - Interface of composite reference Reference1 must be compatible with the interface declared by promoted component reference. Operation not found on target -ASM_6012=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TEST_ASM_6012TestComponent1] - Duplicate property name: Component = TEST_ASM_6012TestComponent1 Property = propertyName -ASM_6016=Need Policy Check -ASM_6020=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1, Reference: Reference1] - No target services found for the component reference to be autowired: Reference1 -ASM_6021=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TEST_ASM_6021TestComponent1, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite31] - Promoted component service not found: Composite = {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite31 Service = Not_A_URI_of_a_Component -ASM_6022=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite32, Component: TestComponent1] - No targets for reference: Composite = {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite32 Reference = Reference1 -ASM_6023=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - [ASM_4008] No value configured on a mustSupply property: Component = TestComponent1 Property = simpleType -ASM_6024=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Component implementation not resolved: Component = TestComponent1 Uri = TestComponent1 -ASM_6025=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}] - Duplicate component name: Composite = {http://docs.oasis-open.org/ns/opencsa/sca/200903} Component = TestComponent1 -ASM_6028=org.apache.tuscany.sca.contribution.processor.ContributionReadException: Error: property has both @type and @element attribute values - InvalidProperty -ASM_6029=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: Error: Composite {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_ASM_6029 can only include another composite with the identical @local attribute value -ASM_6030=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: Error: Composite {http://docs.oasis-open.org/ns/opencsa/scatests/200903}Invalid_composite_name is not a valid composite within the domain -ASM_6031=org.oasisopen.sca.ServiceRuntimeException: [] - [POL40009] Intent {http://docs.oasis-open.org/ns/opencsa/sca/200903}suspendsTransaction and {http://docs.oasis-open.org/ns/opencsa/sca/200903}propagatesTransaction are mutually exclusive -ASM_6032=org.oasisopen.sca.ServiceRuntimeException: [] - [POL40009] Intent {http://docs.oasis-open.org/ns/opencsa/sca/200903}propagatesTransaction and {http://docs.oasis-open.org/ns/opencsa/sca/200903}suspendsTransaction are mutually exclusive -ASM_6033=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite41, Component: TestComponent1] - Component type reference not found for component reference: Component = TestComponent1 Reference = reference1 -ASM_8001=TODO -ASM_8004=org.apache.tuscany.sca.interfacedef.InvalidCallbackException: Callback org.oasisopen.sca.test.Service6Callback must be remotable on remotable interface org.oasisopen.sca.test.Service6 -ASM_8005=org.apache.tuscany.sca.interfacedef.InvalidCallbackException: Callbackorg.oasisopen.sca.test.Service7Callback must not be remotable on local interface org.oasisopen.sca.test.Service7 -ASM_8006=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_8006, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_ASM_8006] - The interface.wsdl element has a forward interface with a callback declared in the WSDL {http://test.sca.oasisopen.org/}Service9Callback and a callback interface also declared using the callbackInterface attribute {http://test.sca.oasisopen.org/}Service8Callback but the callback interfaces are not equal. -ASM_8007=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent2] - Component service interface incompatible with implementation service interface: Component = TestComponent2 Service = Service1 -ASM_8008=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Component reference interface incompatible with implementation reference interface: Component = TestComponent1 Reference = Reference1 -ASM_8009=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TEST_ASM_8009Component1] - Component reference interface incompatible with implementation reference interface: Component = TEST_ASM_8009Component1 Reference = Reference1 -ASM_8010=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TEST_ASM_8010Component2] - Component reference interface incompatible with implementation reference interface: Component = TEST_ASM_8010Component2 Reference = Service1 -ASM_8011=TODO -ASM_8012=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TEST_ASM_8012Component1, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite64] - Interface of composite reference Reference1 must be compatible with the interface declared by promoted component reference. -ASM_8018=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestClient] - Component service interface incompatible with implementation service interface: Component = TestClient Service = TestInvocation -ASM_8019=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_8019, Artifact: Test_ASM_8019.composite] - The interface.wsdl interface {http://test.sca.oasisopen.org/}Service1 element can only have a remotable attribute with the value "true" as WSDL interface are assumed to be remotable by default. The value that was found is: false. -ASM_9002=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestComponent1] - Multiple bindings with the same name for a service: Service = Service1 Binding name = Fred -ASM_10001=org.oasisopen.sca.ServiceRuntimeException: [Contribution: General, Definitions: jar:file:***/General/target/General.zip!/META-INF/definitions.xml] - Duplicate intent {http://docs.oasis-open.org/ns/opencsa/scatests/200903}Fred found in domain -ASM_10003=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_10003, Artifact: META-INF/definitions.xml, Definitions: jar:file:***ASM_10003.zip!/META-INF/definitions.xml] - XMLSchema validation error occured in: Test_ASM_10003.composite ,line = 17, column = 2, Message = cvc-complex-type.2.4.a: Invalid content was found starting with element 'component'. One of '{"http://docs.oasis-open.org/ns/opencsa/sca/200903":documentation, "http://docs.oasis-open.org/ns/opencsa/sca/200903":intent, "http://docs.oasis-open.org/ns/opencsa/sca/200903":policySet, "http://docs.oasis-open.org/ns/opencsa/sca/200903":binding, "http://docs.oasis-open.org/ns/opencsa/sca/200903":bindingType, "http://docs.oasis-open.org/ns/opencsa/sca/200903":implementationType, WC[##other:"http://docs.oasis-open.org/ns/opencsa/sca/200903"]}' is expected. -ASM_12007=TODO -ASM_12008=TODO -ASM_12011=TODO -ASM_12012=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_12012, Artifact: META-INF/sca-contribution.xml] - XMLSchema validation error occured in: Test_ASM_12012.composite ,line = 16, column = 2, Message = cvc-complex-type.2.4.a: Invalid content was found starting with element 'component'. One of '{"http://docs.oasis-open.org/ns/opencsa/sca/200903":documentation, "http://docs.oasis-open.org/ns/opencsa/sca/200903":deployable, "http://docs.oasis-open.org/ns/opencsa/sca/200903":importBase, "http://docs.oasis-open.org/ns/opencsa/sca/200903":exportBase, WC[##other:"http://docs.oasis-open.org/ns/opencsa/sca/200903"]}' is expected. -ASM_13001=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_13001, Artifact: Test_ASM_13001.composite] - XMLSchema validation error occured in: Test_ASM_13001.composite ,line = 25, column = 9, Message = cvc-complex-type.2.4.a: Invalid content was found starting with element 'sevrice'. One of '{"http://docs.oasis-open.org/ns/opencsa/sca/200903":service, "http://docs.oasis-open.org/ns/opencsa/sca/200903":reference, "http://docs.oasis-open.org/ns/opencsa/sca/200903":property, WC[##other:"http://docs.oasis-open.org/ns/opencsa/sca/200903"]}' is expected. -ASM_13002=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_13002, Artifact: Test_ASM_13002.composite] - XMLSchema validation error occured in: Test_ASM_13002.composite ,line = 28, column = 13, Message = cvc-complex-type.2.4.a: Invalid content was found starting with element 'operation'. One of '{"http://docs.oasis-open.org/ns/opencsa/sca/200903":binding, "http://docs.oasis-open.org/ns/opencsa/sca/200903":callback, WC[##other:"http://docs.oasis-open.org/ns/opencsa/sca/200903"]}' is expected. -ASM_13003=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_13003, Artifact: Test_ASM_13003.composite] - XMLSchema validation error occured in: Test_ASM_13003.composite ,line = 23, column = 5, Message = cvc-complex-type.2.4.a: Invalid content was found starting with element 'binding.ws'. One of '{"http://docs.oasis-open.org/ns/opencsa/sca/200903":documentation, "http://docs.oasis-open.org/ns/opencsa/sca/200903":include, "http://docs.oasis-open.org/ns/opencsa/sca/200903":service, "http://docs.oasis-open.org/ns/opencsa/sca/200903":property, "http://docs.oasis-open.org/ns/opencsa/sca/200903":component, "http://docs.oasis-open.org/ns/opencsa/sca/200903":reference, "http://docs.oasis-open.org/ns/opencsa/sca/200903":wire, WC[##other:"http://docs.oasis-open.org/ns/opencsa/sca/200903"]}' is expected. -ASM_13004=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TestClient, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestClient_0002, Component: TestClient_0002TestClient] - [ASM_4008] No value configured on a mustSupply property -ASM_13005=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_13005, Artifact: Test_ASM_13005.composite] - XMLSchema validation error occured in: Test_ASM_13005.composite ,line = 25, column = 9, Message = cvc-elt.2: The value of {abstract} in the element declaration for 'implementation' must be false. -ASM_13006=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_13006, Artifact: Test_ASM_13006.composite] - XMLSchema validation error occured in: Test_ASM_13006.composite ,line = 28, column = 13, Message = cvc-complex-type.3.2.2: Attribute 'callback' is not allowed to appear in element 'interface.java'. -ASM_13007=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_13007, Artifact: Test_ASM_13007.composite] - XMLSchema validation error occured in: Test_ASM_13007.composite ,line = 29, column = 9, Message = cvc-complex-type.3.2.2: Attribute 'mulplicity' is not allowed to appear in element 'reference'. -ASM_13008=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_13008, Artifact: Test_ASM_13008.composite] - XMLSchema validation error occured in: Test_ASM_13008.composite ,line = 40, column = 14, Message = cvc-complex-type.2.4.a: Invalid content was found starting with element 'operation'. One of '{"http://docs.oasis-open.org/ns/opencsa/sca/200903":documentation, "http://docs.oasis-open.org/ns/opencsa/sca/200903":wireFormat, "http://docs.oasis-open.org/ns/opencsa/sca/200903":operationSelector}' is expected. \ No newline at end of file diff --git a/java/sca/otest/newlayout/tuscany-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java b/java/sca/otest/newlayout/tuscany-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java deleted file mode 100644 index afea19fe0b..0000000000 --- a/java/sca/otest/newlayout/tuscany-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.otest; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.equinox.launcher.Contribution; -import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper; -import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher; - -import client.RuntimeBridge; -import client.TestConfiguration; - - -/** - * An implementation of the Runtime Bridge for the Apache Tuscany SCA runtime (version 2.x) - * - */ -public class TuscanyOSGiRuntimeBridge implements RuntimeBridge { - - static final String CONTRIBUTION_LOCATION_PROPKEY = "OASIS_TESTENV_CONTRIBUTION_LOCATION"; - - protected NodeLauncher launcher; - protected Node node; - TestConfiguration testConfiguration = null; - protected Properties expectedErrorMessages; - - public TuscanyOSGiRuntimeBridge() { - // read test error mapping - expectedErrorMessages = new Properties(); - try { - InputStream propertiesStream = this.getClass().getResourceAsStream("/tuscany-oasis-sca-tests-errors.properties"); - expectedErrorMessages.load(propertiesStream); - } catch (IOException e) { - System.out.println("Unable to read oasis-sca-tests-errors.properties file"); - } - } - - public TestConfiguration getTestConfiguration() { - return testConfiguration; - } - - public void setTestConfiguration(TestConfiguration testConfiguration) { - this.testConfiguration = testConfiguration; - } - - public boolean startContribution(String contributionLocation, String[] contributionNames) throws Exception { - try { - // Tuscany specific code which starts the contribution(s) holding the test - launcher = NodeLauncher.newInstance(); - - Contribution[] contributions = new Contribution[contributionNames.length]; - String[] contributionURIs = getContributionURIs(contributionLocation); - for (int i = 0; i < contributions.length; i++) { - contributions[i] = new Contribution(contributionNames[i], contributionURIs[i]); - } // end for - - node = launcher.createNode(testConfiguration.getComposite(), contributions); - System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader()); - // Start the node - node.start(); - } catch (Exception e) { - System.out.println(e.getMessage()); - e.printStackTrace(); - throw e; - } // end try - - return true; - } // end method startContribution - - /** - * Gets the location of the Contributions as URIs - * @param contributionLocation - a location pattern URI, which contains one or more "%1" - * substrings, which are substituted with the name of the contribution to get the URI of - * the contribution - * @return the contribution locations as an array of Strings - */ - protected String[] getContributionURIs(String contributionLocation) throws Exception { - String[] locations; - locations = testConfiguration.getContributionNames(); - - if (locations != null && contributionLocation != null) { - - for (int i = 0; i < locations.length; i++) { - String aLocation = contributionLocation.replaceAll("%1", locations[i]); - - locations[i] = aLocation; - } // end for - } else { - if (locations == null) { - // No contribution specified - throw an Exception - throw new Exception("Unable to start SCA runtime - no contribution supplied - error"); - } else { - // No contribution location supplied - throw an Exception - throw new Exception("Unable to start SCA runtime - no contribution location supplied - error"); - } // end if - } // end if - - return locations; - } // end getContributionURI - - public void stopContribution() { - if (node != null) { - node.stop(); - node.destroy(); - } // end if - if (launcher != null) { - launcher.destroy(); - } // end if - } // end method stopContribution - - public String getContributionLocation(Class testClass) { - return ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass()); - } // end method getContributionLocation - - public void checkError(String testName, Throwable ex) throws Throwable { - String expectedMessage = expectedErrorMessages.getProperty(testName); - String receivedMessage = ex.getMessage(); - - if (expectedMessage == null){ - fail("Null expected error message for test " + testName + - "Please add message to oasis-sca-tests-errors.properties"); - } - - if (receivedMessage == null){ - fail("Null received error message for test " + testName); - } - - int messageStart = receivedMessage.indexOf("] - "); - - if (messageStart < 0){ - fail("Message separator not found for test " + testName); - } - - receivedMessage = receivedMessage.substring(messageStart + 4); - - assertEquals( expectedMessage, receivedMessage ); - - return; - } - -} // end class TuscanyRuntimeBridge diff --git a/java/sca/otest/newlayout/tuscany-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java b/java/sca/otest/newlayout/tuscany-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java deleted file mode 100644 index 9591be0192..0000000000 --- a/java/sca/otest/newlayout/tuscany-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java +++ /dev/null @@ -1,223 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.otest; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.io.BufferedWriter; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; -import java.util.StringTokenizer; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -import client.RuntimeBridge; -import client.TestConfiguration; - -/** - * An implementation of the Runtime Bridge for the Apache Tuscany SCA runtime (version 2.x) - * - */ -public class TuscanyRuntimeBridge implements RuntimeBridge { - - static final String CONTRIBUTION_LOCATION_PROPKEY = "OASIS_TESTENV_CONTRIBUTION_LOCATION"; - - protected NodeFactory launcher; - protected Node node; - protected Properties expectedErrorMessages; - - TestConfiguration testConfiguration = null; - - public TuscanyRuntimeBridge() { - // read test error mapping - expectedErrorMessages = new Properties(); - try { - InputStream propertiesStream = this.getClass().getResourceAsStream("/tuscany-oasis-sca-tests-errors.properties"); - expectedErrorMessages.load(propertiesStream); - } catch (IOException e) { - System.out.println("Unable to read oasis-sca-tests-errors.properties file"); - } - } - - public TestConfiguration getTestConfiguration() { - return testConfiguration; - } - - public void setTestConfiguration(TestConfiguration testConfiguration) { - this.testConfiguration = testConfiguration; - } - - public boolean startContribution(String contributionLocation, String[] contributionNames) throws Exception { - try { - // Tuscany specific code which starts the contribution(s) holding the test - launcher = NodeFactory.newInstance(); - - Contribution[] contributions = new Contribution[contributionNames.length]; - String[] contributionURIs = getContributionURIs(contributionLocation); - for (int i = 0; i < contributions.length; i++) { - contributions[i] = new Contribution(contributionNames[i], contributionURIs[i]); - } // end for - - node = launcher.createNode(testConfiguration.getComposite(), contributions); - // Start the node - node.start(); - - // For debugging - // print out the composites that have been read in success cases - // System.out.println(((NodeImpl)node).dumpDomainComposite()); - } catch (Exception e) { - System.out.println(e.getMessage()); - e.printStackTrace(); - throw e; - } // end try - - return true; - } // end method startContribution - - /** - * Gets the location of the Contributions as URIs - * @param contributionLocation - a location pattern URI, which contains one or more "%1" - * substrings, which are substituted with the name of the contribution to get the URI of - * the contribution - * @return the contribution locations as an array of Strings - */ - protected String[] getContributionURIs(String contributionLocation) throws Exception { - String[] locations; - locations = testConfiguration.getContributionNames(); - - if (locations != null && contributionLocation != null) { - - for (int i = 0; i < locations.length; i++) { - String aLocation = contributionLocation.replaceAll("%1", locations[i]); - - locations[i] = aLocation; - } // end for - } else { - if (locations == null) { - // No contribution specified - throw an Exception - throw new Exception("Unable to start SCA runtime - no contribution supplied - error"); - } else { - // No contribution location supplied - throw an Exception - throw new Exception("Unable to start SCA runtime - no contribution location supplied - error"); - } // end if - } // end if - - return locations; - } // end getContributionURI - - public void stopContribution() { - if (node != null) { - node.stop(); - node.destroy(); - } // end if - if (launcher != null) { - launcher.destroy(); - } // end if - } // end method stopContribution - - public String getContributionLocation(Class testClass) { - return ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass()); - } // end method getContributionLocation - - public void checkError(String testName, Throwable ex) throws Throwable { - - String expectedMessage = expectedErrorMessages.getProperty(testName); - String receivedMessage = ex.getMessage(); - - if (expectedMessage == null){ - writeMissingMessage(testName, ex); - fail("Null expected error message for test " + testName + - "Please add message to oasis-sca-tests-errors.properties"); - } // end if - - if (receivedMessage == null){ - ex.printStackTrace(); - fail("Null received error message for test " + testName); - } // end if - - if (expectedMessage.startsWith("*")) { - // allow using * to ignore a message comparison - return; - } - - // Deal with the case where the message has variable parts within it - // marked with the characters ***. Here we tokenize the epected string - // and make sure all the individual parts are present in the results string - String expectedMessageParts[] = expectedMessage.split("\\*\\*\\*"); - - if (expectedMessageParts.length > 1){ - int foundParts = 0; - for(int i = 0; i < expectedMessageParts.length; i++){ - if (receivedMessage.indexOf(expectedMessageParts[i]) > -1 ){ - foundParts++; - } - } - - if (foundParts == expectedMessageParts.length){ - return; - } - } - - - // Deal with the case where the end of the message is variable (eg contains absolute filenames) - // and where the only relevant part is the start of the message - in this case the expected - // message only contains the stem section which is unchanging... - if( receivedMessage.length() > expectedMessage.length() ) { - // Truncate the received message to the length of the expected message - receivedMessage = receivedMessage.substring(0, expectedMessage.length() ); - } // end if - - if (!expectedMessage.equals(receivedMessage)) { - writeIncorrectMessage(testName, expectedMessage, receivedMessage); - } - - assertEquals( expectedMessage, receivedMessage ); - - return; - - } - - protected void writeMissingMessage(String testName, Throwable ex) { - try { - BufferedWriter out = new BufferedWriter(new FileWriter("target/OTestMissingMsgs.txt", true)); - out.write(testName + "=*"); - out.newLine(); - out.close(); - } catch (IOException e) { - } - } - - protected void writeIncorrectMessage(String testName, String expected, String received) { - try { - BufferedWriter out = new BufferedWriter(new FileWriter("target/OTestIncorrectMsgs.txt", true)); - out.write(testName); out.newLine(); - out.write(" " + expected); out.newLine(); - out.write(" " + received); out.newLine(); - out.close(); - } catch (IOException e) { - } - } - -} // end class TuscanyRuntimeBridge -- cgit v1.2.3