Author: slaws
Date: Thu Jan 13 11:59:35 2011
New Revision: 1058524
URL: http://svn.apache.org/viewvc?rev=1058524&view=rev
Log:
Fixes to match latest OASIS changes
Modified:
tuscany/otest/newlayout/tuscany-test-runner/pom.xml
tuscany/otest/newlayout/tuscany-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
Modified: tuscany/otest/newlayout/tuscany-test-runner/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/otest/newlayout/tuscany-test-runner/pom.xml?rev=1058524&r1=1058523&r2=1058524&view=diff
==============================================================================
--- tuscany/otest/newlayout/tuscany-test-runner/pom.xml (original)
+++ tuscany/otest/newlayout/tuscany-test-runner/pom.xml Thu Jan 13 11:59:35 2011
@@ -55,13 +55,6 @@
<version>2.0-SNAPSHOT</version>
</dependency>
- <!-- Not sure why this is required for ASM. But ASM_6039 & ASM_6036
fail without it -->
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>2.1.7</version>
- </dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified:
tuscany/otest/newlayout/tuscany-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
URL:
http://svn.apache.org/viewvc/tuscany/otest/newlayout/tuscany-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties?rev=1058524&r1=1058523&r2=1058524&view=diff
==============================================================================
---
tuscany/otest/newlayout/tuscany-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
(original)
+++
tuscany/otest/newlayout/tuscany-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
Thu Jan 13 11:59:35 2011
@@ -79,7 +79,7 @@ ASM_8019=org.oasisopen.sca.ServiceRuntim
ASM_9002=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: TestComponent1]
- Multiple bindings with the same name for a service: Service = Service1
Binding name = Fred
ASM_9005=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component:
TEST_ASM_9005Component1] - [ASM90005] The SCA binding Service1 on component
TEST_ASM_9005Component1 service Service1 should not have a URI and the URI is
currently set to http://example/bar
ASM_10001=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_10001,
Artifact: META-INF/definitions.xml, Definitions:
jar:file:***ASM_10001***.zip!/META-INF/definitions.xml] - [ASM10001,POL30002]
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 = ***, column = ***, 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/200912":documentation,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":intent,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":policySet,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":bindingType,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":implementationType,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":externalAttachment,
WC[##other:"http://docs.oasis-open.org/ns/opencsa/sca/200912"]}' is expected.
+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: ***/definitions.xml ,line = ***, column = ***, 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/200912":documentation,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":intent,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":policySet,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":bindingType,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":implementationType,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":externalAttachment,
WC[##other:"http://docs.oasis-open.org/ns/opencsa/sca/200912"]}' is expected.
ASM_12003=org.apache.tuscany.sca.contribution.processor.ContributionResolveException:
Invalid interface when resolving
ASM_12007=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: TestComponent1]
- [ASM50004,JCA30002,JCI80001] Component service interface incompatible with
implementation service interface: Component = TestComponent1 Service = Service1
Operation operation1 not found on target
ASM_12008=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component:
TEST_ASM_12008TestComponent1] - [ASM50004,JCA30002,JCI80001] Component service
interface incompatible with implementation service interface: Component =
TEST_ASM_12008TestComponent1 Service = Service1 Operation operation1 not found
on target
