correct various things to get the compliance tests running in the stand-alone environment

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

4 files changed, 28 insertions, 47 deletions

diff --git a/otest/newlayout/tuscany-policy-test-runner/pom.xml b/otest/newlayout/tuscany-policy-test-runner/pom.xml
index 3746597b60..c11b8da331 100644
--- a/otest/newlayout/tuscany-policy-test-runner/pom.xml
+++ b/otest/newlayout/tuscany-policy-test-runner/pom.xml
@@ -29,12 +29,20 @@
     <name>Apache Tuscany SCA Policy Specification Tests</name>
 
     <dependencies>
-        <dependency>
+        <!-- This is only needed to get the module working in Eclipse which doesn't pick it up from the dependency plugin unpack -->
+        <!-- The dependency plugin unpack is needed as presently the surefire plugin wont run tests in a dependency jar -->
+        <!-- dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-policy-tests</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency -->
+
+       <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <version>2.0-SNAPSHOT</version>
             <type>pom</type>
-        </dependency> 
+        </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -50,53 +58,17 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-transaction-runtime-geronimo</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 added them to their 
-     Local repo. 
-        <dependency>
-            <groupId>org.oasis-open.sca.assembly</groupId>
-            <artifactId>General_Java</artifactId>
-            <version>1.0</version>
-        </dependency>
--->
-
-<!-- don't think these are explicitly required now
-        <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>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.5.3</version>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.19</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.5.3</version>
-            <scope>test</scope>
-        </dependency>  
+           <groupId>org.codehaus.woodstox</groupId>
+           <artifactId>wstx-asl</artifactId>
+           <version>3.2.9</version>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>
diff --git a/otest/newlayout/tuscany-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties b/otest/newlayout/tuscany-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
index d2c50402b2..b566f2f402 100644
--- a/otest/newlayout/tuscany-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
+++ b/otest/newlayout/tuscany-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
@@ -91,5 +91,5 @@ ASM_13003=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_13003, A
 ASM_13004=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: TestClient, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestClient_0002, Component: TestClient_0002TestClient] - [ASM40011,ASM60034] 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 = ***, column = ***, 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 = ***, column = ***, 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 = ***, column = ***, Message = cvc-complex-type.3.2.2: Attribute 'mulplicity' is not allowed to appear in element 'reference'.
+ASM_13007=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_13007, Artifact: Test_ASM_13007.composite] - XMLSchema validation error occured in: Test_ASM_13007.composite ,line = ***, column = ***, Message = cvc-enumeration-valid: Value '2..2' is not facet-valid with respect to enumeration '[0..1, 1..1, 0..n, 1..n]'. It must be a value from the enumeration.
 ASM_13008=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_13008, Artifact: Test_ASM_13008.composite] - XMLSchema validation error occured in: Test_ASM_13008.composite ,line = ***, column = ***, 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/200912":documentation, "http://docs.oasis-open.org/ns/opencsa/sca/200912":wireFormat, "http://docs.oasis-open.org/ns/opencsa/sca/200912":operationSelector, "http://docs.oasis-open.org/ns/opencsa/sca/200912":requires, "http://docs.oasis-open.org/ns/opencsa/sca/200912":policySetAttachment}' is expected.
\ No newline at end of file
diff --git a/otest/newlayout/tuscany-ws-test-runner/pom.xml b/otest/newlayout/tuscany-ws-test-runner/pom.xml
index 6dfad36d98..aa69805227 100644
--- a/otest/newlayout/tuscany-ws-test-runner/pom.xml
+++ b/otest/newlayout/tuscany-ws-test-runner/pom.xml
@@ -54,6 +54,13 @@
             <artifactId>tuscany-host-jetty</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

+        

+        <dependency>

+           <groupId>org.codehaus.woodstox</groupId>

+           <artifactId>wstx-asl</artifactId>

+           <version>3.2.9</version>

+         <scope>runtime</scope>

+        </dependency>        

 

         <dependency>

             <groupId>javax.servlet</groupId>

@@ -61,11 +68,13 @@
             <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>

diff --git a/otest/newlayout/tuscany-ws-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties b/otest/newlayout/tuscany-ws-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
index 2cf54d4a1f..d51e1d8df8 100644
--- a/otest/newlayout/tuscany-ws-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
+++ b/otest/newlayout/tuscany-ws-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
@@ -23,7 +23,7 @@ BWS_2007=org.apache.tuscany.sca.runtime.ActivationException: org.apache.tuscany.
 BWS_2011=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BWS_2011, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_BWS_2011] - [BWS20005][BWS20010] The WSDL binding transport http://example.com/foo/bar is not supported by Tuscany

 BWS_2013=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BWS_2013, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_BWS_2013] - [BWS20005][BWS20010] The WSDL binding transport http://example.com/foo/bar is not supported by Tuscany

 BWS_2015=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BWS_2015, Artifact: Test_BWS_2015.composite] - [BWS20017] binding.ws has a @wsdli:wsdlLocation attribute but no @wsdlElement attribute

-BWS_2016=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BWS_2016, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_BWS_2016] - Exception locating wsdli:location resource: org.apache.tuscany.sca.contribution.processor.ContributionReadException: java.io.FileNotFoundException: http://example.org/Service1.wsdl

+BWS_2016=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BWS_2016, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_BWS_2016] - Exception locating wsdli:location resource: org.apache.tuscany.sca.contribution.processor.ContributionReadException:

 BWS_2017=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BWS_2017, Artifact: Test_BWS_2017.composite] - [BWS20019] with binding.ws you can only specify one of url, wsa:EndpointReference, #wsdl.service or #wsdl.port. The following were found [uri, wsa:EndpointReference]

 BWS_2018=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BWS_2018, Artifact: Test_BWS_2018.composite] - [BWS20020] For the callback element of an SCA service, the binding must not specify an endpoint address URI or a WS-Addressing wsa:EndpointReference

 BWS_2019=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BWS_2019, Artifact: Test_BWS_2019.composite] - XMLSchema validation error occured in: Test_BWS_2019.composite ,line = 36, column = 10, Message = cvc-complex-type.3.2.2: Attribute 'invalidAttribute' is not allowed to appear in element 'binding.ws'.