From ae4a72fb797a5956b6b9547ae765e84b9fde0135 Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 15 Oct 2010 12:42:57 +0000 Subject: Delete shades and remove all refernces to them as they're now replaced by base + extension-runtime approach git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1022892 13f79535-47bb-0310-9956-ffa450edef68 --- .../aggregations/base-runtime-nodep/pom.xml | 4 +- .../distribution/aggregations/base-runtime/pom.xml | 1 - sca-java-2.x/trunk/distribution/all/pom.xml | 3 - .../trunk/distribution/tomcat/tomcat-war/pom.xml | 23 --- .../helloworld-bpel-contribution/pom.xml | 4 +- .../helloworld-spring-contribution/pom.xml | 4 +- .../helloworld-js-client/pom.xml | 4 +- sca-java-2.x/trunk/shades/bpel-nodep/pom.xml | 75 -------- sca-java-2.x/trunk/shades/bpel/pom.xml | 132 ------------- sca-java-2.x/trunk/shades/jms-nodep/pom.xml | 107 ----------- sca-java-2.x/trunk/shades/jms/pom.xml | 124 ------------ sca-java-2.x/trunk/shades/json-nodep/pom.xml | 73 -------- sca-java-2.x/trunk/shades/json/pom.xml | 167 ----------------- sca-java-2.x/trunk/shades/pom.xml | 43 ----- sca-java-2.x/trunk/shades/spring-nodep/pom.xml | 72 ------- sca-java-2.x/trunk/shades/spring/pom.xml | 111 ----------- .../trunk/shades/webservices-nodep/pom.xml | 69 ------- sca-java-2.x/trunk/shades/webservices/pom.xml | 208 --------------------- .../testing/compliance-tests/binding-jms/pom.xml | 4 +- 19 files changed, 10 insertions(+), 1218 deletions(-) delete mode 100644 sca-java-2.x/trunk/shades/bpel-nodep/pom.xml delete mode 100644 sca-java-2.x/trunk/shades/bpel/pom.xml delete mode 100644 sca-java-2.x/trunk/shades/jms-nodep/pom.xml delete mode 100644 sca-java-2.x/trunk/shades/jms/pom.xml delete mode 100644 sca-java-2.x/trunk/shades/json-nodep/pom.xml delete mode 100644 sca-java-2.x/trunk/shades/json/pom.xml delete mode 100644 sca-java-2.x/trunk/shades/pom.xml delete mode 100644 sca-java-2.x/trunk/shades/spring-nodep/pom.xml delete mode 100644 sca-java-2.x/trunk/shades/spring/pom.xml delete mode 100644 sca-java-2.x/trunk/shades/webservices-nodep/pom.xml delete mode 100644 sca-java-2.x/trunk/shades/webservices/pom.xml diff --git a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml index 4b13f57490..94f9312c1c 100644 --- a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml +++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml @@ -32,8 +32,8 @@ - org.apache.tuscany.sca.shades - tuscany-base + org.apache.tuscany.sca + tuscany-base-runtime ${pom.version} diff --git a/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml index 8c778dae5a..9fab49707d 100644 --- a/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml +++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml @@ -309,7 +309,6 @@ org.apache.tuscany.sca:* - org.apache.tuscany.sca.shades:* diff --git a/sca-java-2.x/trunk/distribution/all/pom.xml b/sca-java-2.x/trunk/distribution/all/pom.xml index 699dd4de06..f74f490836 100644 --- a/sca-java-2.x/trunk/distribution/all/pom.xml +++ b/sca-java-2.x/trunk/distribution/all/pom.xml @@ -400,9 +400,6 @@ * - - org.apache.tuscany.sca.shades - diff --git a/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml index 5fb6af2271..9491507338 100644 --- a/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml +++ b/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml @@ -51,29 +51,6 @@ tuscany-base-runtime 2.0-SNAPSHOT - - diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml index 3f4be82f71..f1bf7820da 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml @@ -64,8 +64,8 @@ 2.0-SNAPSHOT - org.apache.tuscany.sca.shades - tuscany-bpel + org.apache.tuscany.sca + tuscany-implementation-bpel-runtime 2.0-SNAPSHOT diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml index b8cb765c38..9e42ad8ac8 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml @@ -55,8 +55,8 @@ 2.0-SNAPSHOT - org.apache.tuscany.sca.shades - tuscany-spring + org.apache.tuscany.sca + tuscany-implementation-spring-runtime 2.0-SNAPSHOT diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml index d064ecbf33..ecd04d6d5d 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml @@ -39,8 +39,8 @@ - org.apache.tuscany.sca.shades - tuscany-json-nodep + org.apache.tuscany.sca + tuscany-databinding-json 2.0-SNAPSHOT diff --git a/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml b/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml deleted file mode 100644 index f30f5f899e..0000000000 --- a/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-shades - 2.0-SNAPSHOT - ../pom.xml - - - org.apache.tuscany.sca.shades - tuscany-bpel-nodep - Apache Tuscany SCA BPEL Jar including dependencies - - - - org.apache.tuscany.sca.shades - tuscany-bpel - ${pom.version} - - - org.apache.tuscany.sca.shades - tuscany-webservices - ${pom.version} - provided - - - org.apache.tuscany.sca - tuscany-base-runtime - ${pom.version} - provided - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 1.3.2 - - - package - - shade - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/shades/bpel/pom.xml b/sca-java-2.x/trunk/shades/bpel/pom.xml deleted file mode 100644 index 4fbfac8dfa..0000000000 --- a/sca-java-2.x/trunk/shades/bpel/pom.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-shades - 2.0-SNAPSHOT - ../pom.xml - - - org.apache.tuscany.sca.shades - tuscany-bpel - Apache Tuscany SCA BPEL Jar - - - - - org.apache.tuscany.sca - tuscany-implementation-bpel-runtime - ${pom.version} - - - org.apache.tuscany.sca - tuscany-assembly - - - org.apache.tuscany.sca - tuscany-assembly-xml - - - org.apache.tuscany.sca - tuscany-core - - - org.apache.tuscany.sca - tuscany-contribution - - - org.apache.tuscany.sca - tuscany-sca-api - - - org.apache.tuscany.sca - tuscany-databinding - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - - - org.apache.tuscany.sca - tuscany-interface-java - - - org.apache.tuscany.sca - tuscany-interface-wsdl - - - org.apache.tuscany.sca - tuscany-node-impl - - - - commons-logging - commons-logging - - - asm - asm - - - - - - org.apache.tuscany.sca - tuscany-base-runtime - ${pom.version} - provided - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 1.3.2 - - - package - - shade - - - true - - - org.apache.tuscany.sca:* - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/shades/jms-nodep/pom.xml b/sca-java-2.x/trunk/shades/jms-nodep/pom.xml deleted file mode 100644 index f0ffded58e..0000000000 --- a/sca-java-2.x/trunk/shades/jms-nodep/pom.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-shades - 2.0-SNAPSHOT - ../pom.xml - - - org.apache.tuscany.sca.shades - tuscany-jms-nodep - Apache Tuscany SCA JMS Support Jar including dependencies - - - - - org.apache.tuscany.sca.shades - tuscany-jms - ${pom.version} - - - org.apache.activemq - activemq-core - 5.3.0 - - - org.apache.activemq - kahadb - - - org.apache.activemq.protobuf - activemq-protobuf - - - org.apache.geronimo.specs - geronimo-j2ee-management_1.0_spec - - - commons-logging - commons-logging-api - - - commons-logging - commons-logging - - - org.springframework - spring-context - - - commons-net - commons-net - - - - - - org.apache.tuscany.sca - tuscany-base-runtime - ${pom.version} - provided - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 1.3.2 - - - package - - shade - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/shades/jms/pom.xml b/sca-java-2.x/trunk/shades/jms/pom.xml deleted file mode 100644 index 859a9ae01d..0000000000 --- a/sca-java-2.x/trunk/shades/jms/pom.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-shades - 2.0-SNAPSHOT - ../pom.xml - - - org.apache.tuscany.sca.shades - tuscany-jms - Apache Tuscany SCA JMS Support Jar - - - - - org.apache.tuscany.sca - tuscany-binding-jms-runtime - ${pom.version} - - - org.apache.tuscany.sca - tuscany-assembly - - - org.apache.tuscany.sca - tuscany-core-spi - - - org.apache.tuscany.sca - tuscany-core - - - org.apache.tuscany.sca - tuscany-assembly-xml - - - org.apache.tuscany.sca - tuscany-interface-java - - - org.apache.tuscany.sca - tuscany-interface-wsdl - - - org.apache.tuscany.sca - tuscany-databinding-jaxb - - - org.apache.tuscany.sca - tuscany-binding-ws-wsdlgen - - - org.apache.tuscany.sca - tuscany-policy-security - - - org.apache.tuscany.sca - tuscany-contribution - - - org.apache.tuscany.sca - tuscany-sca-api - - - - - - org.apache.tuscany.sca - tuscany-base-runtime - ${pom.version} - provided - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 1.3.2 - - - package - - shade - - - true - - - org.apache.tuscany.sca:* - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/shades/json-nodep/pom.xml b/sca-java-2.x/trunk/shades/json-nodep/pom.xml deleted file mode 100644 index cf1b91b2de..0000000000 --- a/sca-java-2.x/trunk/shades/json-nodep/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-shades - 2.0-SNAPSHOT - ../pom.xml - - - org.apache.tuscany.sca.shades - tuscany-json-nodep - Apache Tuscany SCA JSONP Support Jar including dependencies - - - - - org.apache.tuscany.sca.shades - tuscany-json - ${pom.version} - - - - - org.apache.tuscany.sca - tuscany-base-runtime - ${pom.version} - provided - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 1.3.2 - - - package - - shade - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/shades/json/pom.xml b/sca-java-2.x/trunk/shades/json/pom.xml deleted file mode 100644 index e20063db1d..0000000000 --- a/sca-java-2.x/trunk/shades/json/pom.xml +++ /dev/null @@ -1,167 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-shades - 2.0-SNAPSHOT - ../pom.xml - - - org.apache.tuscany.sca.shades - tuscany-json - Apache Tuscany SCA JSON Support Jar - - - - - org.apache.tuscany.sca - tuscany-binding-jsonp-runtime - ${pom.version} - - - org.apache.tuscany.sca - tuscany-assembly - - - org.apache.tuscany.sca - tuscany-assembly-xml - - - org.apache.tuscany.sca - tuscany-contribution - - - org.apache.tuscany.sca - tuscany-sca-api - - - org.apache.tuscany.sca - tuscany-host-http - - - - - org.apache.tuscany.sca - tuscany-binding-jsonrpc-runtime - ${pom.version} - - - org.apache.tuscany.sca - tuscany-assembly - - - org.apache.tuscany.sca - tuscany-core-spi - - - org.apache.tuscany.sca - tuscany-core - - - org.apache.tuscany.sca - tuscany-common-xml - - - org.apache.tuscany.sca - tuscany-databinding - - - org.apache.ws.commons.axiom - axiom-api - - - org.apache.ws.commons.axiom - axiom-impl - - - org.apache.tuscany.sca - tuscany-assembly-xml - - - org.apache.tuscany.sca - tuscany-contribution - - - org.apache.tuscany.sca - tuscany-sca-api - - - org.apache.tuscany.sca - tuscany-host-http - - - - - - org.apache.tuscany.sca - tuscany-implementation-web-client - ${pom.version} - - - org.apache.tuscany.sca - tuscany-assembly - - - org.apache.tuscany.sca - tuscany-implementation-web-runtime - - - - - - org.apache.tuscany.sca - tuscany-base-runtime - ${pom.version} - provided - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 1.3.2 - - - package - - shade - - - true - - - org.apache.tuscany.sca:* - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/shades/pom.xml b/sca-java-2.x/trunk/shades/pom.xml deleted file mode 100644 index ec593cf34f..0000000000 --- a/sca-java-2.x/trunk/shades/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - ../pom.xml - 2.0-SNAPSHOT - - - tuscany-shades - pom - Apache Tuscany SCA Shaded Jars - - - jms - json - json-nodep - spring - spring-nodep - webservices - webservices-nodep - - - diff --git a/sca-java-2.x/trunk/shades/spring-nodep/pom.xml b/sca-java-2.x/trunk/shades/spring-nodep/pom.xml deleted file mode 100644 index 33d6858cde..0000000000 --- a/sca-java-2.x/trunk/shades/spring-nodep/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-shades - 2.0-SNAPSHOT - ../pom.xml - - - org.apache.tuscany.sca.shades - tuscany-spring-nodep - Apache Tuscany SCA Spring Support Jar including dependencies - - - - - org.apache.tuscany.sca.shades - tuscany-spring - ${pom.version} - - - - org.apache.tuscany.sca - tuscany-base-runtime - ${pom.version} - provided - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 1.3.2 - - - package - - shade - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/shades/spring/pom.xml b/sca-java-2.x/trunk/shades/spring/pom.xml deleted file mode 100644 index b5f31e3235..0000000000 --- a/sca-java-2.x/trunk/shades/spring/pom.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-shades - 2.0-SNAPSHOT - ../pom.xml - - - org.apache.tuscany.sca.shades - tuscany-spring - Apache Tuscany SCA Spring Support Jar - - - - - org.apache.tuscany.sca - tuscany-implementation-spring - ${pom.version} - - - org.apache.tuscany.sca - tuscany-assembly - - - org.apache.tuscany.sca - tuscany-assembly-xml - - - org.apache.tuscany.sca - tuscany-contribution - - - org.apache.tuscany.sca - tuscany-sca-api - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - - - - - org.apache.tuscany.sca - tuscany-implementation-spring-runtime - ${pom.version} - - - org.apache.tuscany.sca - tuscany-sca-api - - - - - - org.apache.tuscany.sca - tuscany-base-runtime - ${pom.version} - provided - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 1.3.2 - - - package - - shade - - - true - - - org.apache.tuscany.sca:* - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml b/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml deleted file mode 100644 index b4aa5d6d94..0000000000 --- a/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-shades - 2.0-SNAPSHOT - ../pom.xml - - - org.apache.tuscany.sca.shades - tuscany-webservices-nodep - Apache Tuscany SCA Web Services Jar including dependencies - - - - org.apache.tuscany.sca.shades - tuscany-webservices - ${pom.version} - - - org.apache.tuscany.sca - tuscany-base-runtime - ${pom.version} - provided - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 1.3.2 - - - package - - shade - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/shades/webservices/pom.xml b/sca-java-2.x/trunk/shades/webservices/pom.xml deleted file mode 100644 index 9997c2294e..0000000000 --- a/sca-java-2.x/trunk/shades/webservices/pom.xml +++ /dev/null @@ -1,208 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-shades - 2.0-SNAPSHOT - ../pom.xml - - - org.apache.tuscany.sca.shades - tuscany-webservices - Apache Tuscany SCA Web Services Jar - - - - - org.apache.tuscany.sca - tuscany-binding-ws-runtime-axis2 - ${pom.version} - - - org.apache.tuscany.sca - tuscany-binding-ws - - - org.apache.tuscany.sca - tuscany-binding-ws-wsdlgen - - - org.apache.tuscany.sca - tuscany-interface-wsdl - - - org.apache.tuscany.sca - tuscany-core - - - org.apache.tuscany.sca - tuscany-contribution - - - org.apache.tuscany.sca - tuscany-assembly-xml - - - org.apache.tuscany.sca - tuscany-interface-java - - - org.apache.tuscany.sca - tuscany-interface-java-jaxws - - - org.apache.tuscany.sca - tuscany-databinding - - - org.apache.tuscany.sca - tuscany-core-databinding - - - org.apache.tuscany.sca - tuscany-databinding-jaxb - - - org.apache.tuscany.sca - tuscany-host-http - - - org.apache.tuscany.sca - tuscany-core-spi - - - org.apache.tuscany.sca - tuscany-assembly - - - org.apache.tuscany.sca - tuscany-xsd - - - org.apache.ws.commons.schema - XmlSchema - - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - - - javax.servlet - servlet-api - - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - - - org.codehaus.woodstox - wstx-asl - - - javax.mail - mail - - - xalan - xalan - - - xml-apis - xml-apis - - - org.apache.geronimo.specs - geronimo-stax-api_1.0_spec - - - org.apache.rampart - rampart-trust - - - javax.activation - activation - - - commons-logging - commons-logging - - - log4j - log4j - - - jaxen - jaxen - - - opensaml - opensaml - - - xalan - xalan - - - xerces - xercesImpl - - - - - - org.apache.tuscany.sca - tuscany-base-runtime - ${pom.version} - provided - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 1.3.2 - - - package - - shade - - - true - - - org.apache.tuscany.sca:* - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml index a8dc567396..6413eecc66 100644 --- a/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml +++ b/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml @@ -45,8 +45,8 @@ - org.apache.tuscany.sca.shades - tuscany-jms + org.apache.tuscany.sca + tuscany-binding-jms-runtime 2.0-SNAPSHOT -- cgit v1.2.3