Correct messages for 8010 and 12012. Code fix for 12012 coming shortly.

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

1 files changed, 2 insertions, 2 deletions

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 30e0d6d37a..dde931b946 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
@@ -64,7 +64,7 @@ ASM_8006=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_8006, Com
 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_8010=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TEST_ASM_8010Component2, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite63] - Interface of composite service Service1 must be subset of the interface declared by promoted component service. Callback operation not found on target
 ASM_8011=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}TestComposite62] - Interface of composite reference Reference1 must be compatible with the interface declared by promoted component reference. Callback operation not found on target
 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_8017=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TEST_ASM_8017Component1, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite72] - Interface of composite service Service1a must be subset of the interface declared by promoted component service. Callback interface doesn't match
@@ -77,7 +77,7 @@ ASM_12003=org.apache.tuscany.sca.contribution.processor.ContributionResolveExcep
 ASM_12007=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/2009032}TestComposite5, Component: TestComposite5TestComponent1] - Component type service not found for component service (missing @Remotable annotation?): Component = TestComposite5TestComponent1 Service = Service2
 ASM_12008=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200903}, Component: TEST_ASM_12008TestComponent1, Composite: {http://docs.oasis-open.org/ns/opencsa/scatests/2009032}TestComposite5, Component: TestComposite5TestComponent1] - Component type service not found for component service (missing @Remotable annotation?): Component = TestComposite5TestComponent1 Service = Service2
 ASM_12011=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/2009032}TestComposite68, Component: TestComponent1] - Component implementation not resolved: Component = TestComponent1 Uri = TestComponent1
-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_12012=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_12012, Artifact: META-INF/sca-contribution.xml] - XMLSchema validation error occured in: jar:file:/C:/simon/tuscany/otest/newlayout/tuscany-test-runner/../sca-assembly/ASM_12012/target/ASM_12012.zip!/META-INF/sca-contribution.xml ,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.