From 05536144996fc3fd6a7b6b6e0e00495b4f1e2bb1 Mon Sep 17 00:00:00 2001 From: slaws Date: Fri, 29 Oct 2010 14:36:53 +0000 Subject: TUSCANY-3727 - fix binding-ws which jars so that it doesn't have base Tuscany jars. So we have binding-rmi and binding-ws as examples now. It this works we'll fix the rest for the next release. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1028772 13f79535-47bb-0310-9956-ffa450edef68 --- .../2.0-Beta1/modules/base-runtime-pom/pom.xml | 7 +++ .../modules/binding-ws-runtime-axis2/pom.xml | 7 +-- .../testing/compliance-tests/assembly/pom.xml | 7 +++ .../testing/compliance-tests/binding-jms/pom.xml | 10 +++- .../testing/compliance-tests/binding-ws/pom.xml | 7 +++ .../testing/compliance-tests/java-caa/pom.xml | 7 +++ .../testing/compliance-tests/java-ci/pom.xml | 7 +++ .../testing/compliance-tests/policy/pom.xml | 7 +++ .../testing/itest/callback-two-composites/pom.xml | 20 ++------ .../testing/itest/callback-two-nodes/pom.xml | 20 ++------ .../itest/databindings/jaxb-bottom-up/pom.xml | 58 ++++++++-------------- .../itest/databindings/jaxb-top-down/pom.xml | 49 +++++++----------- .../2.0-Beta1/testing/itest/oneway/pom.xml | 34 +++++++------ .../testing/itest/service-reference/pom.xml | 17 +++---- 14 files changed, 126 insertions(+), 131 deletions(-) (limited to 'sca-java-2.x/branches') diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/base-runtime-pom/pom.xml b/sca-java-2.x/branches/2.0-Beta1/modules/base-runtime-pom/pom.xml index e56f075f73..74f0ba0c28 100644 --- a/sca-java-2.x/branches/2.0-Beta1/modules/base-runtime-pom/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/modules/base-runtime-pom/pom.xml @@ -35,6 +35,13 @@ and local wiring. Other extensions can be added to this base when required --> + + org.apache.tuscany.sca + tuscany-core-runtime-pom + ${pom.version} + pom + + org.apache.tuscany.sca tuscany-domain-node diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws-runtime-axis2/pom.xml b/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws-runtime-axis2/pom.xml index 2ae9240d83..bb68c7bfee 100644 --- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws-runtime-axis2/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws-runtime-axis2/pom.xml @@ -39,18 +39,13 @@ 2.0-Beta1-SNAPSHOT pom provided - - - - org.apache.tuscany.sca - tuscany-binding-ws-wsdlgen - 2.0-Beta1-SNAPSHOT org.apache.tuscany.sca tuscany-policy-security 2.0-Beta1-SNAPSHOT + provided diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/assembly/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/assembly/pom.xml index 0042402014..827b7b2510 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/assembly/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/assembly/pom.xml @@ -38,6 +38,13 @@ 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-core-runtime-pom + 2.0-Beta1-SNAPSHOT + pom + + org.apache.tuscany.sca tuscany-base-runtime-pom diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-jms/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-jms/pom.xml index 2a0bdafef5..4a586295d5 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-jms/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-jms/pom.xml @@ -40,8 +40,16 @@ org.apache.tuscany.sca - tuscany-base-runtime + tuscany-core-runtime-pom 2.0-Beta1-SNAPSHOT + pom + + + + org.apache.tuscany.sca + tuscany-base-runtime-pom + 2.0-Beta1-SNAPSHOT + pom diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-ws/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-ws/pom.xml index 26bb2b6d77..3a19632d75 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-ws/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-ws/pom.xml @@ -38,6 +38,13 @@ 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-core-runtime-pom + 2.0-Beta1-SNAPSHOT + pom + + org.apache.tuscany.sca tuscany-base-runtime-pom diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-caa/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-caa/pom.xml index 667096444e..3e86b2bc64 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-caa/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-caa/pom.xml @@ -38,6 +38,13 @@ 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-core-runtime-pom + 2.0-Beta1-SNAPSHOT + pom + + org.apache.tuscany.sca tuscany-base-runtime-pom diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-ci/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-ci/pom.xml index 4e5b80e1ad..06e18f388a 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-ci/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-ci/pom.xml @@ -38,6 +38,13 @@ 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-core-runtime-pom + 2.0-Beta1-SNAPSHOT + pom + + org.apache.tuscany.sca tuscany-base-runtime-pom diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/policy/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/policy/pom.xml index f1b80e507e..502599015c 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/policy/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/policy/pom.xml @@ -38,6 +38,13 @@ 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-core-runtime-pom + 2.0-Beta1-SNAPSHOT + pom + + org.apache.tuscany.sca tuscany-base-runtime-pom diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-composites/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-composites/pom.xml index 7e7a5c3c6b..c55cbbf72e 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-composites/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-composites/pom.xml @@ -31,21 +31,16 @@ org.apache.tuscany.sca - tuscany-node-api + tuscany-core-runtime-pom 2.0-Beta1-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-node-impl - 2.0-Beta1-SNAPSHOT - test + pom org.apache.tuscany.sca - tuscany-implementation-java-runtime + tuscany-base-runtime-pom 2.0-Beta1-SNAPSHOT + pom test @@ -56,13 +51,6 @@ test - - org.apache.tuscany.sca - tuscany-host-http - 2.0-Beta1-SNAPSHOT - test - - org.apache.tuscany.sca tuscany-host-jetty diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-nodes/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-nodes/pom.xml index 1dc92905b5..69cc0c3538 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-nodes/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-nodes/pom.xml @@ -31,21 +31,16 @@ org.apache.tuscany.sca - tuscany-node-api + tuscany-core-runtime-pom 2.0-Beta1-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-node-impl - 2.0-Beta1-SNAPSHOT - test + pom org.apache.tuscany.sca - tuscany-implementation-java-runtime + tuscany-base-runtime-pom 2.0-Beta1-SNAPSHOT + pom test @@ -56,13 +51,6 @@ test - - org.apache.tuscany.sca - tuscany-host-http - 2.0-Beta1-SNAPSHOT - test - - org.apache.tuscany.sca tuscany-host-jetty diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-bottom-up/pom.xml index 3da82692cc..9e06f0e7ed 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-bottom-up/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-bottom-up/pom.xml @@ -59,62 +59,47 @@ org.apache.tuscany.sca - tuscany-node-api - ${pom.version} + tuscany-core-runtime-pom + 2.0-Beta1-SNAPSHOT + pom + org.apache.tuscany.sca - tuscany-node-impl - ${pom.version} + tuscany-base-runtime-pom + 2.0-Beta1-SNAPSHOT + pom + test + org.apache.tuscany.sca tuscany-binding-ws-runtime-axis2 - ${pom.version} - runtime - - - org.apache.tuscany.sca - tuscany-databinding-jaxb - ${pom.version} - runtime + 2.0-Beta1-SNAPSHOT + test - + org.apache.tuscany.sca - tuscany-databinding-axiom - ${pom.version} - compile + tuscany-host-jetty + 2.0-Beta1-SNAPSHOT + test - + org.apache.tuscany.sca - tuscany-implementation-java-runtime + tuscany-databinding-jaxb ${pom.version} - compile + runtime + org.apache.tuscany.sca - tuscany-interface-java + tuscany-databinding-axiom ${pom.version} compile - - org.apache.tuscany.sca - tuscany-host-jetty - ${pom.version} - runtime - + javax.xml.bind jaxb-api @@ -127,6 +112,7 @@ jaxws-rt 2.1.3 + commons-collections diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-top-down/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-top-down/pom.xml index 381410ace8..6d124be30b 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-top-down/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-top-down/pom.xml @@ -60,62 +60,51 @@ org.apache.tuscany.sca - tuscany-node-api - ${pom.version} + tuscany-core-runtime-pom + 2.0-Beta1-SNAPSHOT + pom + org.apache.tuscany.sca - tuscany-node-impl - ${pom.version} + tuscany-base-runtime-pom + 2.0-Beta1-SNAPSHOT + pom + test + org.apache.tuscany.sca tuscany-binding-ws-runtime-axis2 2.0-Beta1-SNAPSHOT - runtime + test + org.apache.tuscany.sca - tuscany-databinding-jaxb - 2.0-Beta1-SNAPSHOT - runtime - - + test + org.apache.tuscany.sca - tuscany-databinding-axiom + tuscany-binding-ws-runtime-axis2 2.0-Beta1-SNAPSHOT - compile + runtime - org.apache.tuscany.sca - tuscany-implementation-java-runtime + tuscany-databinding-jaxb 2.0-Beta1-SNAPSHOT runtime org.apache.tuscany.sca - tuscany-interface-java + tuscany-databinding-axiom 2.0-Beta1-SNAPSHOT compile - - org.apache.tuscany.sca - tuscany-host-jetty - 2.0-Beta1-SNAPSHOT - runtime - + javax.xml.bind jaxb-api diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/oneway/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/itest/oneway/pom.xml index a4d5564cb5..a98846413e 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/oneway/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/oneway/pom.xml @@ -30,35 +30,39 @@ 2.0-Beta1-SNAPSHOT + + backport-util-concurrent + backport-util-concurrent + 3.1 + + org.apache.tuscany.sca - tuscany-node-api - ${pom.version} + tuscany-core-runtime-pom + 2.0-Beta1-SNAPSHOT + pom - + org.apache.tuscany.sca - tuscany-node-impl - ${pom.version} + tuscany-base-runtime-pom + 2.0-Beta1-SNAPSHOT + pom + test org.apache.tuscany.sca tuscany-binding-ws-runtime-axis2 - ${pom.version} + 2.0-Beta1-SNAPSHOT + test org.apache.tuscany.sca tuscany-host-jetty - ${pom.version} - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - ${pom.version} - runtime - + 2.0-Beta1-SNAPSHOT + test + diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/service-reference/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/itest/service-reference/pom.xml index 06c8037b58..75de7864a1 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/service-reference/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/service-reference/pom.xml @@ -31,30 +31,25 @@ org.apache.tuscany.sca - tuscany-node-api + tuscany-core-runtime-pom 2.0-Beta1-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-node-impl - 2.0-Beta1-SNAPSHOT - test + pom org.apache.tuscany.sca - tuscany-implementation-java-runtime + tuscany-base-runtime-pom 2.0-Beta1-SNAPSHOT + pom test - + org.apache.tuscany.sca tuscany-binding-ws-runtime-axis2 2.0-Beta1-SNAPSHOT test - + org.apache.tuscany.sca -- cgit v1.2.3