Author: kelvingoodson
Date: Mon May 17 12:20:31 2010
New Revision: 945109
URL: http://svn.apache.org/viewvc?rev=945109&view=rev
Log:
expected message and msg definition catchup
Modified:
tuscany/sca-java-2.x/trunk/compliance-tests/assembly/src/test/resources/tuscany-oasis-sca-tests-errors.properties
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
Modified:
tuscany/sca-java-2.x/trunk/compliance-tests/assembly/src/test/resources/tuscany-oasis-sca-tests-errors.properties
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/compliance-tests/assembly/src/test/resources/tuscany-oasis-sca-tests-errors.properties?rev=945109&r1=945108&r2=945109&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/compliance-tests/assembly/src/test/resources/tuscany-oasis-sca-tests-errors.properties
(original)
+++
tuscany/sca-java-2.x/trunk/compliance-tests/assembly/src/test/resources/tuscany-oasis-sca-tests-errors.properties
Mon May 17 12:20:31 2010
@@ -52,7 +52,7 @@ ASM_6020=org.oasisopen.sca.ServiceRuntim
ASM_6021=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component:
TEST_ASM_6021TestComponent1, Composite:
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite31] -
[ASM60004,ASM60032] 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/200912}, Component: TestComponent1,
Composite:
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite32,
Component: TestComponent1] - [ASM60033] 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/200912}, Component: TestComponent1]
- [ASM40011,ASM60034] 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/200912}, Component: TestComponent1]
- [ASM60030,JCI50004] Component implementation not resolved: Component =
TestComponent1 Uri = TestComponent1
+ASM_6024=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: TestComponent1]
- [ASM60030,JCI50004,JCI80001] Component implementation not resolved: Component
= TestComponent1 Uri = TestComponent1
ASM_6025=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}] - [ASM50001] Duplicate
component name: Composite = {http://docs.oasis-open.org/ns/opencsa/sca/200912}
Component = TestComponent1
ASM_6028=org.apache.tuscany.sca.contribution.processor.ContributionReadException:
[ASM40010,ASM60040] Error: property has both @type and @element attribute
values - InvalidProperty
ASM_6029=org.apache.tuscany.sca.contribution.processor.ContributionResolveException:
[ASM60041] 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
@@ -82,7 +82,7 @@ ASM_10003=org.oasisopen.sca.ServiceRunti
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
-ASM_12011=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: TestComponent1]
- [ASM60030,JCI50004] Component implementation not resolved: Component =
TestComponent1 Uri = TestComponent1
+ASM_12011=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: TestComponent1]
- [ASM60030,JCI50004,JCI80001] 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: jar:file:***ASM_12012***.zip!/META-INF/sca-contribution.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":deployable,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":importBase,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":exportBase,
WC[##other:"http://docs.oasis-open.org/ns/opencsa/sca/200912"]}' 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 = ***, column = ***, 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/200912":service,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":reference,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":property,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":requires,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":policySetAttachment,
WC[##other:"http://docs.oasis-open.org/ns/opencsa/sca/200912"]}' 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 = ***, 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":binding,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":callback,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":requires,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":policySetAttachment,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":extensions}' is expected.
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties?rev=945109&r1=945108&r2=945109&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
Mon May 17 12:20:31 2010
@@ -23,7 +23,7 @@ DuplicateComponentReferenceName = Duplic
DuplicateComponentPropertyName = Duplicate component property name: Component
= {0} Property = {1}
NoComponentImplementation = No implementation for component: Component = {0}
ServiceNotFoundForComponentService = Component type service not found for
component service (missing @Remotable annotation?): Component = {0} Service =
{1}
-UnresolvedComponentImplementation = [ASM60030,JCI80001] Component
implementation not resolved: Component = {0} Uri = {1}
+UnresolvedComponentImplementation = [ASM60030,JCI50004,JCI80001] Component
implementation not resolved: Component = {0} Uri = {1}
DuplicateImplementationPropertyName = [ASM40005,ASM60014] Duplicate
implementation property name: Component = {0} Property = {1}
DuplicateImplementationServiceName = [ASM40003,ASM60003,JCA90045] Duplicate
implementation service name: Component = {0} Service = {1}
DuplicateImplementationReferenceName = [ASM40004,ASM50007,ASM60006] Duplicate
implementation reference name: Component = {0} Reference = {1}
@@ -38,7 +38,7 @@ ReferenceIncompatibleInterface = Incompa
ReferencePromotionIncompatibleInterface = Promoted reference interface
incompatible with promoting reference: Promoting interface = {0} Promoted = {1}
ReferencePromotionInterfacesNotEqual = Peer promoted references not equal:
First interface = {0} second interface = {1}
ReferenceIncompatibleComponentInterface =
[JCA30001,JCA30002,JCA30003,JCA90046] Component reference interface
incompatible with implementation reference interface: Component = {0} Reference
= {1} {2}
-ServiceIncompatibleComponentInterface = [ASM50004,JCA30002] Component service
interface incompatible with implementation service interface: Component = {0}
Service = {1} {2}
+ServiceIncompatibleComponentInterface = [ASM50004,JCA30002,JCI80001] Component
service interface incompatible with implementation service interface: Component
= {0} Service = {1} {2}
MultipleBindingsForService = Multiple bindings with the same name for a
service: Service = {0} Binding name = {1}
MultipleBindingsForReference = Multiple bindings with the same name for a
reference: Reference = {0} Binding name = {1}
ReferenceWithoutTargets = [ASM60033] No targets for reference: Composite = {0}
Reference = {1}
