From e6815d9776cb931522865d0061c9ceeca8c86802 Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 12 Nov 2010 13:34:07 +0000 Subject: A bunch more base + extension updates git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1034397 13f79535-47bb-0310-9956-ffa450edef68 --- sca-java-2.x/trunk/modules/policy-logging/pom.xml | 16 ++---- .../trunk/testing/itest/policy/matching/pom.xml | 13 ++--- .../trunk/testing/itest/policy/wspolicy/pom.xml | 17 ++++--- .../itest/ws-jaxws/contribution-java-first/pom.xml | 19 +++++-- .../itest/ws-jaxws/contribution-wsdl-first/pom.xml | 19 +++++-- .../testing/itest/ws-jaxws/external-client/pom.xml | 20 ++++---- .../testing/itest/ws-jaxws/launcher-ri/pom.xml | 59 +--------------------- .../testing/itest/ws/authentication-basic/pom.xml | 18 +++++-- .../ws/contribution-callback-forwardspec/pom.xml | 19 +++++-- .../ws/contribution-callback-fullspec/pom.xml | 19 +++++-- .../ws/contribution-callback-promotion/pom.xml | 19 +++++-- .../testing/itest/ws/contribution-callback/pom.xml | 19 +++++-- .../itest/ws/contribution-doc-lit-wrapped/pom.xml | 19 +++++-- .../testing/itest/ws/contribution-doc-lit/pom.xml | 19 +++++-- .../itest/ws/contribution-java-first/pom.xml | 19 +++++-- .../testing/itest/ws/contribution-rpc-lit/pom.xml | 19 +++++-- .../itest/ws/contribution-wsdl-first/pom.xml | 19 +++++-- .../trunk/testing/itest/ws/defaults/pom.xml | 16 ++++-- .../testing/itest/ws/endpoint-references/pom.xml | 16 ++++-- .../trunk/testing/itest/ws/endpoints/pom.xml | 16 ++++-- .../trunk/testing/itest/ws/http-ssl/pom.xml | 13 +++-- .../trunk/testing/itest/ws/launcher-axis2/pom.xml | 16 +++--- sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml | 16 ++++-- 23 files changed, 280 insertions(+), 165 deletions(-) diff --git a/sca-java-2.x/trunk/modules/policy-logging/pom.xml b/sca-java-2.x/trunk/modules/policy-logging/pom.xml index e4b28fcd20..9f6b343671 100644 --- a/sca-java-2.x/trunk/modules/policy-logging/pom.xml +++ b/sca-java-2.x/trunk/modules/policy-logging/pom.xml @@ -32,19 +32,9 @@ org.apache.tuscany.sca - tuscany-contribution - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-core-spi - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-assembly-xml + tuscany-core-runtime-pom + pom + provided 2.0-SNAPSHOT diff --git a/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml b/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml index d3dca04a64..d2e02c04ce 100644 --- a/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml @@ -33,23 +33,16 @@ org.apache.tuscany.sca - tuscany-feature-webservice + tuscany-base-runtime 2.0-SNAPSHOT - pom org.apache.tuscany.sca - tuscany-policy-wspolicy + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-policy-logging - 2.0-SNAPSHOT - - + diff --git a/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml b/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml index a0bf3de1a8..8980166b57 100644 --- a/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml @@ -33,23 +33,28 @@ org.apache.tuscany.sca - tuscany-feature-webservice + tuscany-base-runtime 2.0-SNAPSHOT - pom org.apache.tuscany.sca - tuscany-policy-wspolicy + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT - + org.apache.tuscany.sca tuscany-policy-logging 2.0-SNAPSHOT - - + + + + org.mortbay.jetty + jetty + 6.1.19 + + diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml index afdfac7a95..8a6777a673 100644 --- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml @@ -31,12 +31,23 @@ - + + org.apache.tuscany.sca + tuscany-base-runtime + 2.0-SNAPSHOT + + + org.apache.tuscany.sca - tuscany-feature-core - pom + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT - + + + + org.mortbay.jetty + jetty + 6.1.19 + diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml index 0bab07d102..6766a2514e 100644 --- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml @@ -31,12 +31,23 @@ - + + org.apache.tuscany.sca + tuscany-base-runtime + 2.0-SNAPSHOT + + + org.apache.tuscany.sca - tuscany-feature-core - pom + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT - + + + + org.mortbay.jetty + jetty + 6.1.19 + diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml index b613a4ad3b..830d2acea5 100644 --- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml @@ -31,21 +31,23 @@ - - + org.apache.tuscany.sca - tuscany-feature-core - pom + tuscany-base-runtime 2.0-SNAPSHOT - + - - + org.apache.tuscany.sca - tuscany-binding-ws-runtime-jaxws-ri + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT + + + + org.mortbay.jetty + jetty + 6.1.19 - diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml index b78095f01a..52f3a9b14d 100644 --- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml @@ -30,67 +30,12 @@ Apache Tuscany SCA iTest WS JAXWS Launcher RI - - - - - org.apache.tuscany.sca - tuscany-feature-core - pom - 2.0-SNAPSHOT - - - - - org.apache.tuscany.sca - tuscany-binding-ws-runtime-jaxws-ri - 2.0-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-ws-wsdlgen - 2.0-SNAPSHOT - - - - - org.apache.tuscany.sca - tuscany-databinding-axiom - 2.0-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-jaxb-axiom - 2.0-SNAPSHOT - - + - - - org.apache.tuscany.sca - tuscany-host-jetty - 2.0-SNAPSHOT - - org.apache.tuscany.sca diff --git a/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml index 211cf97ceb..ea79c1a91f 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml @@ -33,12 +33,22 @@ org.apache.tuscany.sca - tuscany-feature-webservice + tuscany-base-runtime 2.0-SNAPSHOT - pom - - + + + + org.apache.tuscany.sca + tuscany-binding-ws-runtime-axis2 + 2.0-SNAPSHOT + + + org.mortbay.jetty + jetty + 6.1.19 + + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml index ff868b9bd3..0c279ca1f4 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml @@ -31,12 +31,23 @@ - + + org.apache.tuscany.sca + tuscany-base-runtime + 2.0-SNAPSHOT + + + org.apache.tuscany.sca - tuscany-feature-core - pom + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT - + + + + org.mortbay.jetty + jetty + 6.1.19 + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml index 68273c819b..f6badffbce 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml @@ -31,12 +31,23 @@ - + + org.apache.tuscany.sca + tuscany-base-runtime + 2.0-SNAPSHOT + + + org.apache.tuscany.sca - tuscany-feature-core - pom + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT - + + + + org.mortbay.jetty + jetty + 6.1.19 + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml index dcada2d5ad..6b2549e95d 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml @@ -31,12 +31,23 @@ - + + org.apache.tuscany.sca + tuscany-base-runtime + 2.0-SNAPSHOT + + + org.apache.tuscany.sca - tuscany-feature-core - pom + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT - + + + + org.mortbay.jetty + jetty + 6.1.19 + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml index efdd580b18..e716ab7a47 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml @@ -31,12 +31,23 @@ - + + org.apache.tuscany.sca + tuscany-base-runtime + 2.0-SNAPSHOT + + + org.apache.tuscany.sca - tuscany-feature-core - pom + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT - + + + + org.mortbay.jetty + jetty + 6.1.19 + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml index c14b5cda66..e4247dbeb4 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml @@ -31,12 +31,23 @@ - + + org.apache.tuscany.sca + tuscany-base-runtime + 2.0-SNAPSHOT + + + org.apache.tuscany.sca - tuscany-feature-core - pom + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT - + + + + org.mortbay.jetty + jetty + 6.1.19 + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml index 562fd47ab6..0e0ae606c6 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml @@ -31,12 +31,23 @@ - + + org.apache.tuscany.sca + tuscany-base-runtime + 2.0-SNAPSHOT + + + org.apache.tuscany.sca - tuscany-feature-core - pom + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT - + + + + org.mortbay.jetty + jetty + 6.1.19 + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml index de8041888b..63dc9cde67 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml @@ -31,12 +31,23 @@ - + + org.apache.tuscany.sca + tuscany-base-runtime + 2.0-SNAPSHOT + + + org.apache.tuscany.sca - tuscany-feature-core - pom + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT - + + + + org.mortbay.jetty + jetty + 6.1.19 + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml index 400b89ad7c..ca631b05ec 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml @@ -31,12 +31,23 @@ - + + org.apache.tuscany.sca + tuscany-base-runtime + 2.0-SNAPSHOT + + + org.apache.tuscany.sca - tuscany-feature-core - pom + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT - + + + + org.mortbay.jetty + jetty + 6.1.19 + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml index 52945adcf8..5190f5d2fe 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml @@ -31,12 +31,23 @@ - + + org.apache.tuscany.sca + tuscany-base-runtime + 2.0-SNAPSHOT + + + org.apache.tuscany.sca - tuscany-feature-core - pom + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT - + + + + org.mortbay.jetty + jetty + 6.1.19 + diff --git a/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml index 2107b1fc3e..f96fba29ee 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml @@ -33,11 +33,21 @@ org.apache.tuscany.sca - tuscany-feature-webservice + tuscany-base-runtime 2.0-SNAPSHOT - pom + + + + org.apache.tuscany.sca + tuscany-binding-ws-runtime-axis2 + 2.0-SNAPSHOT + + + + org.mortbay.jetty + jetty + 6.1.19 - diff --git a/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml index 99aabcbec0..f69c303a50 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml @@ -33,11 +33,21 @@ org.apache.tuscany.sca - tuscany-feature-webservice + tuscany-base-runtime 2.0-SNAPSHOT - pom + + + + org.apache.tuscany.sca + tuscany-binding-ws-runtime-axis2 + 2.0-SNAPSHOT + + + + org.mortbay.jetty + jetty + 6.1.19 - diff --git a/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml index 84da8f9ab6..9bf6b21f50 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml @@ -33,11 +33,21 @@ org.apache.tuscany.sca - tuscany-feature-webservice + tuscany-base-runtime 2.0-SNAPSHOT - pom + + + + org.apache.tuscany.sca + tuscany-binding-ws-runtime-axis2 + 2.0-SNAPSHOT + + + + org.mortbay.jetty + jetty + 6.1.19 - diff --git a/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml index 05f96f4a25..e9599a38af 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml @@ -33,16 +33,21 @@ org.apache.tuscany.sca - tuscany-feature-webservice + tuscany-base-runtime 2.0-SNAPSHOT - pom - + org.apache.tuscany.sca - tuscany-policy-security + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT + + + org.mortbay.jetty + jetty + 6.1.19 + diff --git a/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml index cb917ea9d6..bca9cf004f 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml @@ -32,16 +32,20 @@ org.apache.tuscany.sca - tuscany-feature-webservice + tuscany-base-runtime 2.0-SNAPSHOT - pom - + - - + org.apache.tuscany.sca - tuscany-host-jetty + tuscany-binding-ws-runtime-axis2 2.0-SNAPSHOT + + + + org.mortbay.jetty + jetty + 6.1.19 diff --git a/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml index cac59f85b4..c42a0def7e 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml @@ -33,11 +33,21 @@ org.apache.tuscany.sca - tuscany-feature-webservice + tuscany-base-runtime 2.0-SNAPSHOT - pom + + + + org.apache.tuscany.sca + tuscany-binding-ws-runtime-axis2 + 2.0-SNAPSHOT + + + + org.mortbay.jetty + jetty + 6.1.19 - -- cgit v1.2.3