From 0db41b897a462a0f6612c41c3d88c386bd13b258 Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 15 Oct 2010 12:34:21 +0000 Subject: Update base-runtime to more closely match old shades/base, and all the scdl models to base, associated test updates to match that, and change the comet binding to use base + extension approach. Still need to look at whats in core-runtime vs base-runtime and still need to work out what really should/shouldn't be in base but at least its all consistent to start with now git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1022891 13f79535-47bb-0310-9956-ffa450edef68 --- .../distribution/aggregations/base-runtime/pom.xml | 141 ++++++------- .../tomcat/tomcat-war/src/main/webapp/LICENSE | 2 - sca-java-2.x/trunk/features/base-runtime/pom.xml | 221 +++++++++++++++++++-- .../trunk/modules/binding-comet-runtime/pom.xml | 39 +--- .../binding-comet/weather-webapp/pom.xml | 3 +- .../binding-jms/helloworld-contribution/pom.xml | 2 +- .../dependencies/ValidateDependenciesTestCase.java | 4 +- 7 files changed, 288 insertions(+), 124 deletions(-) (limited to 'sca-java-2.x') 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 b110432490..8c778dae5a 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 @@ -47,21 +47,6 @@ tuscany-launcher ${pom.version} - - org.apache.tuscany.sca - tuscany-endpoint-hazelcast - ${pom.version} - - - org.apache.tuscany.sca - tuscany-endpoint-hazelcast-client - ${pom.version} - - org.apache.tuscany.sca tuscany-sca-client-impl @@ -91,12 +76,6 @@ - - org.apache.tuscany.sca - tuscany-binding-hazelcast-runtime - ${pom.version} - - org.apache.tuscany.sca tuscany-shell @@ -135,88 +114,100 @@ org.apache.tuscany.sca - tuscany-binding-rmi-runtime + tuscany-policy-security ${pom.version} + + + org.apache.tuscany.sca - tuscany-host-rmi + tuscany-binding-atom ${pom.version} - org.apache.tuscany.sca - tuscany-contribution-osgi + tuscany-binding-comet ${pom.version} - - - org.eclipse - osgi - - org.apache.tuscany.sca - tuscany-implementation-osgi-runtime + tuscany-binding-corba ${pom.version} - - - org.eclipse - osgi - - org.apache.tuscany.sca - tuscany-node-impl-osgi + tuscany-binding-ejb ${pom.version} - - - org.eclipse - osgi - - - org.eclipse.osgi - services - - org.apache.tuscany.sca - tuscany-extensibility-equinox + tuscany-binding-http ${pom.version} - - - org.eclipse - osgi - - org.apache.tuscany.sca - tuscany-node-launcher-equinox + tuscany-binding-jms ${pom.version} - - - org.eclipse - osgi - - - javax.servlet - servlet-api - - - commons-cli - commons-cli - - - - - org.apache.tuscany.sca - tuscany-binding-jms + tuscany-binding-jsonp + ${pom.version} + + + org.apache.tuscany.sca + tuscany-binding-jsonrpc + ${pom.version} + + + org.apache.tuscany.sca + tuscany-binding-rest + ${pom.version} + + + org.apache.tuscany.sca + tuscany-binding-rmi + ${pom.version} + + + org.apache.tuscany.sca + tuscany-binding-ws + ${pom.version} + + + org.apache.tuscany.sca + tuscany-implementation-bpel + ${pom.version} + + + org.apache.tuscany.sca + tuscany-implementation-java + ${pom.version} + + + + org.apache.tuscany.sca + tuscany-implementation-script + ${pom.version} + + + org.apache.tuscany.sca + tuscany-implementation-spring + ${pom.version} + + + org.apache.tuscany.sca + tuscany-implementation-web + ${pom.version} + + + org.apache.tuscany.sca + tuscany-implementation-widget ${pom.version} diff --git a/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE b/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE index f4f88da9ac..62a8772b27 100644 --- a/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE +++ b/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE @@ -216,8 +216,6 @@ conditions of the following licenses. The following components come under Apache Software License 2.0 cglib-2.2.jar - hazelcast-1.8.3.jar - hazelcast-client-1.8.3.jar swizzle-stream-1.0.2.jar XmlSchema-1.4.3.jar diff --git a/sca-java-2.x/trunk/features/base-runtime/pom.xml b/sca-java-2.x/trunk/features/base-runtime/pom.xml index 4c638a72d7..d9c301472c 100644 --- a/sca-java-2.x/trunk/features/base-runtime/pom.xml +++ b/sca-java-2.x/trunk/features/base-runtime/pom.xml @@ -39,50 +39,81 @@ org.apache.tuscany.sca - tuscany-core-runtime + tuscany-domain-node ${pom.version} - pom - org.apache.tuscany.sca - tuscany-binding-sca-runtime + tuscany-implementation-web-runtime + ${pom.version} + + + org.apache.tuscany.sca + tuscany-launcher ${pom.version} - org.apache.tuscany.sca - tuscany-host-webapp + tuscany-sca-client-impl ${pom.version} + + org.apache.tuscany.sca + tuscany-host-jetty + ${pom.version} + + + org.apache.tuscany.sca + tuscany-core-spi + + + org.mortbay.jetty + jetty + + + org.mortbay.jetty + jetty-util + + + javax.servlet + servlet-api + + + org.apache.tuscany.sca - tuscany-implementation-java + tuscany-shell ${pom.version} org.apache.tuscany.sca - tuscany-implementation-java-runtime + tuscany-stripes ${pom.version} + + + net.sourceforge.stripes + stripes + + org.apache.tuscany.sca - tuscany-implementation-web-runtime + tuscany-wink ${pom.version} org.apache.tuscany.sca - tuscany-node-impl + tuscany-binding-ws-runtime-jaxws-ri ${pom.version} org.apache.tuscany.sca - tuscany-node-launcher + tuscany-data-api ${pom.version} @@ -92,11 +123,177 @@ ${pom.version} + + org.apache.tuscany.sca - tuscany-sca-client-impl + tuscany-binding-atom + ${pom.version} + + + org.apache.tuscany.sca + tuscany-binding-comet + ${pom.version} + + + org.apache.tuscany.sca + tuscany-binding-corba ${pom.version} + + org.apache.tuscany.sca + tuscany-binding-ejb + ${pom.version} + + + org.apache.tuscany.sca + tuscany-binding-http + ${pom.version} + + + org.apache.tuscany.sca + tuscany-binding-jms + ${pom.version} + + + org.apache.tuscany.sca + tuscany-binding-jsonp + ${pom.version} + + + org.apache.tuscany.sca + tuscany-binding-jsonrpc + ${pom.version} + + + org.apache.tuscany.sca + tuscany-binding-rest + ${pom.version} + + + org.apache.tuscany.sca + tuscany-binding-rmi + ${pom.version} + + + org.apache.tuscany.sca + tuscany-binding-ws + ${pom.version} + + + org.apache.tuscany.sca + tuscany-implementation-bpel + ${pom.version} + + + org.apache.tuscany.sca + tuscany-implementation-java + ${pom.version} + + + + org.apache.tuscany.sca + tuscany-implementation-script + ${pom.version} + + + org.apache.tuscany.sca + tuscany-implementation-spring + ${pom.version} + + + org.apache.tuscany.sca + tuscany-implementation-web + ${pom.version} + + + org.apache.tuscany.sca + tuscany-implementation-widget + ${pom.version} + + + + + + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec + 1.0.1 + provided + + + + org.codehaus.woodstox + wstx-asl + 3.2.4 + provided + + + stax + stax-api + + + + + + javax.xml.bind + jaxb-api + 2.1 + provided + + + + javax.activation + activation + 1.1 + provided + + + + com.sun.xml.bind + jaxb-impl + 2.1.12 + provided + + + + + javax.xml.ws + jaxws-api + 2.1 + provided + + + javax.xml.soap + saaj-api + + + + + + javax.annotation + jsr250-api + 1.0 + provided + + + + javax.jws + jsr181-api + 1.0-MR1 + provided + + + + javax.xml.stream + stax-api + 1.0-2 + provided + + diff --git a/sca-java-2.x/trunk/modules/binding-comet-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-comet-runtime/pom.xml index e309cfd98c..094fd062ef 100644 --- a/sca-java-2.x/trunk/modules/binding-comet-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-comet-runtime/pom.xml @@ -34,8 +34,10 @@ org.apache.tuscany.sca - tuscany-binding-comet + tuscany-base-runtime-pom + pom 2.0-SNAPSHOT + provided org.atmosphere @@ -58,35 +60,14 @@ 1.0 provided - - org.apache.tuscany.sca - tuscany-host-http - 2.0-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-host-jetty - 2.0-SNAPSHOT - test - - - org.apache.tuscany.sca - tuscany-node-impl - 2.0-SNAPSHOT - test - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 2.0-SNAPSHOT - test - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-SNAPSHOT + + + org.mortbay.jetty + jetty + 6.1.19 test - + + diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml index bcd090dad9..0d37ef89aa 100644 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml @@ -35,14 +35,13 @@ org.apache.tuscany.sca - tuscany-base-runtime-nodep + tuscany-base-runtime 2.0-SNAPSHOT org.apache.tuscany.sca tuscany-binding-comet-runtime 2.0-SNAPSHOT - jar javax diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml index b98f5ac74f..dbc3cd82a0 100644 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml @@ -45,7 +45,7 @@ org.apache.activemq - activemq-core + activemq-all 5.3.0 runtime diff --git a/sca-java-2.x/trunk/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java b/sca-java-2.x/trunk/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java index e9691cb3fe..2cdd77bde7 100644 --- a/sca-java-2.x/trunk/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java +++ b/sca-java-2.x/trunk/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java @@ -35,8 +35,6 @@ import org.junit.Test; * Current required jars are: * asm-3.1.jar * cglib-2.2.jar - * hazelcast-1.8.3.jar - * hazelcast-client-1.8.3.jar * tuscany-base-2.0-SNAPSHOT.jar * wsdl4j-1.6.2.jar * XmlSchema-1.4.3.jar @@ -53,6 +51,6 @@ public class ValidateDependenciesTestCase { Assert.assertTrue(dependenciesDir.exists()); File[] dependencyFiles = dependenciesDir.listFiles(); - Assert.assertEquals(8, dependencyFiles.length); + Assert.assertEquals(6, dependencyFiles.length); } } -- cgit v1.2.3