Author: antelder
Date: Thu Mar 4 19:48:08 2010
New Revision: 919145
URL: http://svn.apache.org/viewvc?rev=919145&view=rev
Log:
Tidy up dependencies, update all err message so row/column is *** as it moves
around with different XML parsers
Removed:
tuscany/sca-java-2.x/trunk/compliance-tests/assembly/src/test/java/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java
tuscany/sca-java-2.x/trunk/compliance-tests/java-caa/src/test/java/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java
tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/java/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java
Modified:
tuscany/sca-java-2.x/trunk/compliance-tests/assembly/pom.xml
tuscany/sca-java-2.x/trunk/compliance-tests/assembly/src/test/resources/tuscany-oasis-sca-tests-errors.properties
tuscany/sca-java-2.x/trunk/compliance-tests/java-caa/pom.xml
tuscany/sca-java-2.x/trunk/compliance-tests/java-caa/src/test/resources/tuscany-oasis-sca-tests-errors.properties
tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/pom.xml
tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
Modified: tuscany/sca-java-2.x/trunk/compliance-tests/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/compliance-tests/assembly/pom.xml?rev=919145&r1=919144&r2=919145&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/compliance-tests/assembly/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/compliance-tests/assembly/pom.xml Thu Mar 4
19:48:08 2010
@@ -31,62 +31,29 @@
<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 -->
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <artifactId>oasis-assembly-test-runner</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-deployment</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl-osgi</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher-equinox</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
+ <artifactId>tuscany-base</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
+ <artifactId>tuscany-webservices</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <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>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.19</version>
</dependency>
<dependency>
@@ -98,8 +65,6 @@
</dependencies>
-
-
<build>
<finalName>${artifactId}</finalName>
<plugins>
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=919145&r1=919144&r2=919145&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
Thu Mar 4 19:48:08 2010
@@ -77,12 +77,13 @@
ASM_12007=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/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/200912}, 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/200912}, Component: TestComponent1]
- [ASM60030] 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 = 16,
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 = 25, 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,
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 = 28, 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,
WC[##other:"http://docs.oasis-open.org/ns/opencsa/sca/200912"]}' 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 = ***, 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/200912":documentation,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":include,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":service,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":property,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":component,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":reference,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":wire,
WC[##other:"http://docs.oasis-open.org/ns/opencsa/sca/200912"]}' is expected.
-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 = 25, 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 = 28, 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 = 29, column = ***, Message =
cvc-complex-type.3.2.2: Attribute 'mulplicity' is not allowed to appear in
element 'reference'.
-ASM_13008=org.oasisopen.sca.ServiceRuntimeException: [Contribution: ASM_13008,
Artifact: Test_ASM_13008.composite] - XMLSchema validation error occured in:
Test_ASM_13008.composite ,line = 40, 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}' is
expected.
\ No newline at end of file
+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,
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,
WC[##other:"http://docs.oasis-open.org/ns/opencsa/sca/200912"]}' 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 = ***, column = ***, 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/200912":documentation,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":include,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":service,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":property,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":component,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":reference,
"http://docs.oasis-open.org/ns/opencsa/sca/200912":wire,
WC[##other:"http://docs.oasis-open.org/ns/opencsa/sca/200912"]}' is expected.
+ASM_13004_1=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_13004=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: TestClient] -
PropertySourceXpathInvalid
+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_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}' is
expected.
\ No newline at end of file
Modified: tuscany/sca-java-2.x/trunk/compliance-tests/java-caa/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/compliance-tests/java-caa/pom.xml?rev=919145&r1=919144&r2=919145&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/compliance-tests/java-caa/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/compliance-tests/java-caa/pom.xml Thu Mar 4
19:48:08 2010
@@ -31,62 +31,29 @@
<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 -->
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-deployment</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl-osgi</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <artifactId>oasis-javacaa-test-runner</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher-equinox</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
+ <artifactId>tuscany-base</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
+ <artifactId>tuscany-webservices</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <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>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.19</version>
</dependency>
<dependency>
Modified:
tuscany/sca-java-2.x/trunk/compliance-tests/java-caa/src/test/resources/tuscany-oasis-sca-tests-errors.properties
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/compliance-tests/java-caa/src/test/resources/tuscany-oasis-sca-tests-errors.properties?rev=919145&r1=919144&r2=919145&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/compliance-tests/java-caa/src/test/resources/tuscany-oasis-sca-tests-errors.properties
(original)
+++
tuscany/sca-java-2.x/trunk/compliance-tests/java-caa/src/test/resources/tuscany-oasis-sca-tests-errors.properties
Thu Mar 4 19:48:08 2010
@@ -21,7 +21,7 @@
JCA_3004=org.oasisopen.sca.ServiceRuntimeException: [Contribution: JCA_3004,
Composite:
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_JCA_3004] - Class
Not Found Exception: Service3Callback
JCA_3006=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component:
TEST_JCA_3006Component2] - [ASM50004] Component service interface incompatible
with implementation service interface: Component = TEST_JCA_3006Component2
Service = Service3WithCallback Callback operation not found on target
JCA_3007=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component:
TEST_JCA_3007Component1] - Component reference interface incompatible with
implementation reference interface: Component = TEST_JCA_3007Component1
Reference = reference1 Callback operation not found on target
-JCA_3008=org.oasisopen.sca.ServiceRuntimeException: [Contribution: JCA_3008,
Artifact: Test_JCA_3008.composite] - XMLSchema validation error occured in:
Test_JCA_3008.composite ,line = 30, column = 13, Message =
cvc-complex-type.3.2.2: Attribute 'oops' is not allowed to appear in element
'interface.java'.
+JCA_3008=org.oasisopen.sca.ServiceRuntimeException: [Contribution: JCA_3008,
Artifact: Test_JCA_3008.composite] - XMLSchema validation error occured in:
Test_JCA_3008.composite ,line = ***, column = ***, Message =
cvc-complex-type.3.2.2: Attribute 'oops' is not allowed to appear in element
'interface.java'.
JCA_3009=org.apache.tuscany.sca.interfacedef.InvalidAnnotationException:
@Remotable annotation present in a interface marked as not remotable in the SCDL
JCA_3011=org.oasisopen.sca.ServiceRuntimeException: [Contribution: JCA_3011,
Composite:
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_JCA_3011] -
JCA30006 Forbidden annotation interface org.oasisopen.sca.annotation.Property
found in class org.oasisopen.sca.test.JCA3011Service
JCA_3012=org.oasisopen.sca.ServiceRuntimeException: [Contribution: JCA_3012,
Composite:
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}TEST_JCA_3012] -
JCA30007 Forbidden annotation interface org.oasisopen.sca.annotation.Property
found in class org.oasisopen.sca.test.JCA3012Service3Callback
Modified: tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/pom.xml?rev=919145&r1=919144&r2=919145&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/pom.xml Thu Mar 4
19:48:08 2010
@@ -26,67 +26,34 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tuscany-compliance-test-java-ci</artifactId>
- <name>Apache Tuscany SCA Specification Compliance Tests Java Client
Implementation</name>
+ <name>Apache Tuscany SCA Specification Compliance Tests Java CI</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 -->
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <artifactId>oasis-javaci-test-runner</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-deployment</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl-osgi</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher-equinox</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
+ <artifactId>tuscany-base</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
+ <artifactId>tuscany-webservices</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <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>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.19</version>
</dependency>
<dependency>
@@ -98,8 +65,6 @@
</dependencies>
-
-
<build>
<finalName>${artifactId}</finalName>
<plugins>
Modified:
tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties?rev=919145&r1=919144&r2=919145&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
(original)
+++
tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
Thu Mar 4 19:48:08 2010
@@ -18,12 +18,12 @@
POJO_5001=org.apache.tuscany.sca.contribution.processor.ContributionResolveException:
org.apache.tuscany.sca.implementation.java.introspect.impl.NoConstructorException:
No public constructor for class
POJO_5005=org.apache.tuscany.sca.contribution.processor.ContributionResolveException:
org.apache.tuscany.sca.implementation.java.introspect.impl.AmbiguousConstructorException:
POJO_5006=org.apache.tuscany.sca.contribution.processor.ContributionResolveException:
org.apache.tuscany.sca.implementation.java.introspect.impl.DuplicateConstructorException:
Multiple constructors marked with @Constructor
-POJO_5007=org.apache.tuscany.sca.implementation.java.introspect.impl.InvalidConstructorException:
Multiple annotated constrictors
-POJO_8002=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component:
TEST_POJO_8002Component1] - Component service interface incompatible with
implementation service interface: Component = TEST_POJO_8002Component1 Service
= Service1Superset Operation not found on target
+POJO_5007=org.apache.tuscany.sca.contribution.processor.ContributionResolveException:
org.apache.tuscany.sca.implementation.java.introspect.impl.InvalidConstructorException:
Multiple annotated constructors
+POJO_8002=org.oasisopen.sca.ServiceRuntimeException: [Composite:
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component:
TEST_POJO_8002Component1] - [ASM50004] Component service interface incompatible
with implementation service interface: Component = TEST_POJO_8002Component1
Service = Service1Superset Operation not found on target
POJO_8008=* unknown
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 = 30, column = 9, Message =
cvc-complex-type.3.2.2: Attribute 'interface' is not allowed to appear in
element 'implementation.java'.
+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'.
POJO_10001=org.oasisopen.sca.ServiceRuntimeException: [Contribution:
POJO_10001, Artifact: META-INF/sca-contribution.xml] - The value of the
@package attribute on the <import.java/> element is not unique across all other
<import.java/> elements within the contribution.
POJO_10004=org.apache.tuscany.sca.contribution.processor.ContributionResolveException:
[JCI100007] A Java package org.oasisopen.sca.test;version=1.0.0 that is
specified on an export element MUST be contained within the contribution
containing the export element.
POJO_10005=org.oasisopen.sca.ServiceRuntimeException: [Contribution:
POJO_10005, Artifact: META-INF/sca-contribution.xml] - The value of the
@package attribute on the <export.java/> element is not unique across all other
<export.java/> elements within the contribution.
