Author: antelder
Date: Sat Jul 24 06:54:12 2010
New Revision: 978816
URL: http://svn.apache.org/viewvc?rev=978816&view=rev
Log:
Merge r966703 from trunk to branch for java ci compliance test err msg update
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta1/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 24 06:54:12 2010
@@ -1 +1 @@
-/tuscany/sca-java-2.x/trunk:966568,966629,966650-966658,966706,966708,966714,966983
+/tuscany/sca-java-2.x/trunk:966568,966629,966650-966658,966703,966706,966708,966714,966983
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta1/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties?rev=978816&r1=978815&r2=978816&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/2.0-Beta1/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
(original)
+++
tuscany/sca-java-2.x/branches/2.0-Beta1/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
Sat Jul 24 06:54:12 2010
@@ -22,7 +22,7 @@ POJO_5007=org.apache.tuscany.sca.contrib
POJO_8002=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component:
TEST_POJO_8002Component1] - [ASM50004,JCA30002,JCI80001] Component service
interface incompatible with implementation service interface: Component =
TEST_POJO_8002Component1 Service = Service1Superset Operation operationb not
found on target
POJO_8003=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component:
TEST_POJO_8003Component1, Service: Service1] -
[POL40009,ASM60009,ASM60010,JCA70001,JCA70003] Intent
{http://docs.oasis-open.org/ns/opencsa/sca/200912}suspendsTransaction and
{http://docs.oasis-open.org/ns/opencsa/sca/200912}propagatesTransaction are
mutually exclusive
POJO_8008=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component:
TEST_POJO_8008Component1, Service: Service1] -
[POL40009,ASM60009,ASM60010,JCA70001,JCA70003] Intent
{http://docs.oasis-open.org/ns/opencsa/sca/200912}suspendsTransaction and
{http://docs.oasis-open.org/ns/opencsa/sca/200912}propagatesTransaction are
mutually exclusive
-POJO_8012=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component:
TEST_POJO_8012Component1, Service: Service1] -
[POL40009,ASM60009,ASM60010,JCA70001,JCA70003] Intent
{http://docs.oasis-open.org/ns/opencsa/sca/200912}managedTransaction.global and
{http://docs.oasis-open.org/ns/opencsa/sca/200912}noManagedTransaction are
mutually exclusive
+POJO_8012=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component:
TEST_POJO_8012Component1, Service: Service1] -
[POL40009,ASM60009,ASM60010,JCA70001,JCA70003] Intent
{http://docs.oasis-open.org/ns/opencsa/sca/200912}noManagedTransaction and
{http://docs.oasis-open.org/ns/opencsa/sca/200912}managedTransaction are
mutually exclusive
POJO_8013=org.apache.tuscany.sca.contribution.processor.ContributionResolveException:
org.apache.tuscany.sca.implementation.java.introspect.impl.DuplicatePropertyException:
duplicateProperty
POJO_8014=org.apache.tuscany.sca.contribution.processor.ContributionResolveException:
org.apache.tuscany.sca.implementation.java.introspect.impl.DuplicateReferenceException:
duplicateReference
POJO_9001=org.oasisopen.sca.ServiceRuntimeException: [Contribution: POJO_9001,
Artifact: Test_POJO_9001.composite] - XMLSchema validation error occured in:
Test_POJO_9001.composite ,line = ***, column = ***, Message =
cvc-complex-type.3.2.2: Attribute 'interface' is not allowed to appear in
element 'implementation.java'.