diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-15 12:34:21 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-15 12:34:21 +0000 |
| commit | 0db41b897a462a0f6612c41c3d88c386bd13b258 (patch) | |
| tree | 2f9f89f5665aaec2a88078f13a589fcd3d11289e /sca-java-2.x/trunk/distribution | |
| parent | e662f5780c1a2f10bde2d6a1987769830665e154 (diff) | |
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
Diffstat (limited to 'sca-java-2.x/trunk/distribution')
| -rw-r--r-- | sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml | 141 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE | 2 |
2 files changed, 66 insertions, 77 deletions
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 @@ -49,21 +49,6 @@ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast-client</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <!-- dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-client-javascript</artifactId>
- <version>${pom.version}</version>
- </dependency -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-client-impl</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -93,12 +78,6 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-hazelcast-runtime</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-shell</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -135,88 +114,100 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rmi-runtime</artifactId>
+ <artifactId>tuscany-policy-security</artifactId>
<version>${pom.version}</version>
</dependency>
+
+<!-- All the scdl modules -->
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-rmi</artifactId>
+ <artifactId>tuscany-binding-atom</artifactId>
<version>${pom.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-contribution-osgi</artifactId>
+ <artifactId>tuscany-binding-comet</artifactId>
<version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-osgi-runtime</artifactId>
+ <artifactId>tuscany-binding-corba</artifactId>
<version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl-osgi</artifactId>
+ <artifactId>tuscany-binding-ejb</artifactId>
<version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>services</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-extensibility-equinox</artifactId>
+ <artifactId>tuscany-binding-http</artifactId>
<version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher-equinox</artifactId>
+ <artifactId>tuscany-binding-jms</artifactId>
<version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </exclusion>
- </exclusions>
</dependency>
-
-<!-- All the scdl modules -->
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms</artifactId>
+ <artifactId>tuscany-binding-jsonp</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-jsonrpc</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-rest</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-rmi</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-bpel</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <!-- dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-jaxrs</artifactId>
+ <version>${pom.version}</version>
+ </dependency -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-script</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-spring</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-web</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-widget</artifactId>
<version>${pom.version}</version>
</dependency>
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
|