Update to the lates otests and configurations

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

11 files changed, 10 insertions, 51 deletions

diff --git a/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/oasis-assembly-contributions-2.0-SNAPSHOT.zip b/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/oasis-assembly-contributions-2.0-SNAPSHOT.zip
index 1194c71efc..3596219bcc 100644
--- a/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/oasis-assembly-contributions-2.0-SNAPSHOT.zip
+++ b/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/oasis-assembly-contributions-2.0-SNAPSHOT.zip
diff --git a/maven/org/apache/tuscany/sca/oasis-javacaa-contributions/2.0-SNAPSHOT/oasis-javacaa-contributions-2.0-SNAPSHOT.zip b/maven/org/apache/tuscany/sca/oasis-javacaa-contributions/2.0-SNAPSHOT/oasis-javacaa-contributions-2.0-SNAPSHOT.zip
index 98aadc9339..381eba8da4 100644
--- a/maven/org/apache/tuscany/sca/oasis-javacaa-contributions/2.0-SNAPSHOT/oasis-javacaa-contributions-2.0-SNAPSHOT.zip
+++ b/maven/org/apache/tuscany/sca/oasis-javacaa-contributions/2.0-SNAPSHOT/oasis-javacaa-contributions-2.0-SNAPSHOT.zip
diff --git a/maven/org/apache/tuscany/sca/oasis-jci-contributions/2.0-SNAPSHOT/oasis-jci-contributions-2.0-SNAPSHOT.zip b/maven/org/apache/tuscany/sca/oasis-jci-contributions/2.0-SNAPSHOT/oasis-jci-contributions-2.0-SNAPSHOT.zip
index 8845a27076..f3ec43b715 100644
--- a/maven/org/apache/tuscany/sca/oasis-jci-contributions/2.0-SNAPSHOT/oasis-jci-contributions-2.0-SNAPSHOT.zip
+++ b/maven/org/apache/tuscany/sca/oasis-jci-contributions/2.0-SNAPSHOT/oasis-jci-contributions-2.0-SNAPSHOT.zip
diff --git a/maven/org/apache/tuscany/sca/oasis-policy-contributions/2.0-SNAPSHOT/oasis-policy-contributions-2.0-SNAPSHOT.zip b/maven/org/apache/tuscany/sca/oasis-policy-contributions/2.0-SNAPSHOT/oasis-policy-contributions-2.0-SNAPSHOT.zip
index f0330c06bd..ee54202426 100644
--- a/maven/org/apache/tuscany/sca/oasis-policy-contributions/2.0-SNAPSHOT/oasis-policy-contributions-2.0-SNAPSHOT.zip
+++ b/maven/org/apache/tuscany/sca/oasis-policy-contributions/2.0-SNAPSHOT/oasis-policy-contributions-2.0-SNAPSHOT.zip
diff --git a/maven/org/apache/tuscany/sca/oasis-ws-contributions/2.0-SNAPSHOT/oasis-ws-contributions-2.0-SNAPSHOT.zip b/maven/org/apache/tuscany/sca/oasis-ws-contributions/2.0-SNAPSHOT/oasis-ws-contributions-2.0-SNAPSHOT.zip
index aa08727cd7..12a891422b 100644
--- a/maven/org/apache/tuscany/sca/oasis-ws-contributions/2.0-SNAPSHOT/oasis-ws-contributions-2.0-SNAPSHOT.zip
+++ b/maven/org/apache/tuscany/sca/oasis-ws-contributions/2.0-SNAPSHOT/oasis-ws-contributions-2.0-SNAPSHOT.zip
diff --git a/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.jar b/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.jar
index f8f47a8b3b..05762a86bd 100644
--- a/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.jar
+++ b/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.jar
diff --git a/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.pom b/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.pom
index 11673365a5..74d439c3c1 100644
--- a/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.pom
+++ b/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.pom
@@ -31,73 +31,30 @@
     <dependencies>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

+            <artifactId>tuscany-base-runtime-pom</artifactId>

             <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-deployment</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl-osgi</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-launcher</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>        

+            <type>pom</type>

+        </dependency> 

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-launcher-equinox</artifactId>

+            <artifactId>tuscany-osgi-runtime</artifactId>

             <version>2.0-SNAPSHOT</version>

+            <type>pom</type>

         </dependency> 

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

-        

-         <dependency>

+

+        <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-host-jetty</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

 

-<!-- This dependency causes a problem on systems that haven't compiled the 

-     OASIS contributions independently and hence haven't dded them to their 

-     Local repo.

-        <dependency>

-            <groupId>org.oasis-open.sca.assembly</groupId>

-            <artifactId>General_Java</artifactId>

-            <version>1.0</version>

-        </dependency>

--->

-

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>servlet-api</artifactId>

-            <version>2.5</version>

-        </dependency>

-

-        <dependency>

-            <groupId>com.sun.xml.ws</groupId>

-            <artifactId>jaxws-rt</artifactId>

-            <version>2.1.7</version>

-        </dependency>

-

         <dependency>

             <groupId>junit</groupId>

             <artifactId>junit</artifactId>

@@ -110,7 +67,9 @@
     <build>

         <finalName>${artifactId}</finalName>

         <plugins>

-<!-- for when OASIS deploy the artifacts themselves

+<!-- for when OASIS deploy the artifacts themselves we need to pull the 

+     contributions in locally so that the tests can refer to then and

+     we need to get at the Test_Client so that we can run the tests themselves

           <plugin>

              <groupId>org.apache.maven.plugins</groupId>

              <artifactId>maven-dependency-plugin</artifactId>

diff --git a/maven/org/apache/tuscany/sca/tuscany-otests-policy-tests/2.0-SNAPSHOT/tuscany-otests-policy-tests-2.0-SNAPSHOT.jar b/maven/org/apache/tuscany/sca/tuscany-otests-policy-tests/2.0-SNAPSHOT/tuscany-otests-policy-tests-2.0-SNAPSHOT.jar
index 165018370f..0077b157b5 100644
--- a/maven/org/apache/tuscany/sca/tuscany-otests-policy-tests/2.0-SNAPSHOT/tuscany-otests-policy-tests-2.0-SNAPSHOT.jar
+++ b/maven/org/apache/tuscany/sca/tuscany-otests-policy-tests/2.0-SNAPSHOT/tuscany-otests-policy-tests-2.0-SNAPSHOT.jar
diff --git a/maven/org/apache/tuscany/sca/tuscany-otests-sca-j-caa-tests/2.0-SNAPSHOT/tuscany-otests-sca-j-caa-tests-2.0-SNAPSHOT.jar b/maven/org/apache/tuscany/sca/tuscany-otests-sca-j-caa-tests/2.0-SNAPSHOT/tuscany-otests-sca-j-caa-tests-2.0-SNAPSHOT.jar
index c114dd5c8a..436adb7381 100644
--- a/maven/org/apache/tuscany/sca/tuscany-otests-sca-j-caa-tests/2.0-SNAPSHOT/tuscany-otests-sca-j-caa-tests-2.0-SNAPSHOT.jar
+++ b/maven/org/apache/tuscany/sca/tuscany-otests-sca-j-caa-tests/2.0-SNAPSHOT/tuscany-otests-sca-j-caa-tests-2.0-SNAPSHOT.jar
diff --git a/maven/org/apache/tuscany/sca/tuscany-otests-sca-j-ci-tests/2.0-SNAPSHOT/tuscany-otests-sca-j-ci-tests-2.0-SNAPSHOT.jar b/maven/org/apache/tuscany/sca/tuscany-otests-sca-j-ci-tests/2.0-SNAPSHOT/tuscany-otests-sca-j-ci-tests-2.0-SNAPSHOT.jar
index c32c58e0ba..ec771e9c69 100644
--- a/maven/org/apache/tuscany/sca/tuscany-otests-sca-j-ci-tests/2.0-SNAPSHOT/tuscany-otests-sca-j-ci-tests-2.0-SNAPSHOT.jar
+++ b/maven/org/apache/tuscany/sca/tuscany-otests-sca-j-ci-tests/2.0-SNAPSHOT/tuscany-otests-sca-j-ci-tests-2.0-SNAPSHOT.jar
diff --git a/maven/org/apache/tuscany/sca/tuscany-otests-sca-ws-tests/2.0-SNAPSHOT/tuscany-otests-sca-ws-tests-2.0-SNAPSHOT.jar b/maven/org/apache/tuscany/sca/tuscany-otests-sca-ws-tests/2.0-SNAPSHOT/tuscany-otests-sca-ws-tests-2.0-SNAPSHOT.jar
index aa979810db..9b5a6ec5ca 100644
--- a/maven/org/apache/tuscany/sca/tuscany-otests-sca-ws-tests/2.0-SNAPSHOT/tuscany-otests-sca-ws-tests-2.0-SNAPSHOT.jar
+++ b/maven/org/apache/tuscany/sca/tuscany-otests-sca-ws-tests/2.0-SNAPSHOT/tuscany-otests-sca-ws-tests-2.0-SNAPSHOT.jar