diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-14 09:34:47 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-14 09:34:47 +0000 |
| commit | dcc69e02cd85b02d02aceab998c047a6019bfb43 (patch) | |
| tree | b689523d88e8cfa20eefe4d64d8dc3d74a0a8066 /sca-java-2.x/trunk | |
| parent | 775ae0d8549e59b7f625a91a82cc6b88119cce77 (diff) | |
Start to get rid of shades and replace with the aggregate jars. This moves the shades/base and base-nodep out of shades and into distribution/aggregates and updates to use those. The remaining ones in shades i think can probably just be deleted but i'll do that in separate steps.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1022443 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
42 files changed, 173 insertions, 173 deletions
diff --git a/sca-java-2.x/trunk/shades/base-nodep/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml index 60c1aaccb0..4b13f57490 100644 --- a/sca-java-2.x/trunk/shades/base-nodep/pom.xml +++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml @@ -26,9 +26,9 @@ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base-nodep</artifactId>
- <name>Apache Tuscany SCA Base Jar including dependencies</name>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime-nodep</artifactId>
+ <name>Apache Tuscany SCA Base Runtime Jar including dependencies</name>
<dependencies>
<dependency>
diff --git a/sca-java-2.x/trunk/shades/base-nodep/src/main/java/org/apache/tuscany/sca/base/AggregatedBundleActivator.java b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/src/main/java/org/apache/tuscany/sca/base/AggregatedBundleActivator.java index cb35fed680..cb35fed680 100644 --- a/sca-java-2.x/trunk/shades/base-nodep/src/main/java/org/apache/tuscany/sca/base/AggregatedBundleActivator.java +++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/src/main/java/org/apache/tuscany/sca/base/AggregatedBundleActivator.java diff --git a/sca-java-2.x/trunk/shades/base-nodep/src/main/resources/LICENSE b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/src/main/resources/LICENSE index 69a1a5eee6..69a1a5eee6 100644 --- a/sca-java-2.x/trunk/shades/base-nodep/src/main/resources/LICENSE +++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/src/main/resources/LICENSE diff --git a/sca-java-2.x/trunk/shades/base-nodep/src/main/resources/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/src/main/resources/META-INF/MANIFEST.MF index 728346b3c5..728346b3c5 100644 --- a/sca-java-2.x/trunk/shades/base-nodep/src/main/resources/META-INF/MANIFEST.MF +++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/src/main/resources/META-INF/MANIFEST.MF diff --git a/sca-java-2.x/trunk/shades/base-nodep/src/main/resources/NOTICE b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/src/main/resources/NOTICE index 1bfb4e16c3..1bfb4e16c3 100644 --- a/sca-java-2.x/trunk/shades/base-nodep/src/main/resources/NOTICE +++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/src/main/resources/NOTICE diff --git a/sca-java-2.x/trunk/shades/base-nodep/src/main/resources/README.txt b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/src/main/resources/README.txt index 3de5be9155..3de5be9155 100644 --- a/sca-java-2.x/trunk/shades/base-nodep/src/main/resources/README.txt +++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/src/main/resources/README.txt diff --git a/sca-java-2.x/trunk/shades/base/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml index cddc75945c..2d7ed69ae1 100644 --- a/sca-java-2.x/trunk/shades/base/pom.xml +++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml @@ -26,9 +26,9 @@ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
- <name>Apache Tuscany SCA Base Jar</name>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
+ <name>Apache Tuscany SCA Base Runtime Jar</name>
<dependencies>
diff --git a/sca-java-2.x/trunk/shades/base/src/main/resources/LICENSE b/sca-java-2.x/trunk/distribution/aggregations/base-runtime/src/main/resources/LICENSE index 69a1a5eee6..69a1a5eee6 100644 --- a/sca-java-2.x/trunk/shades/base/src/main/resources/LICENSE +++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime/src/main/resources/LICENSE diff --git a/sca-java-2.x/trunk/shades/base/src/main/resources/NOTICE b/sca-java-2.x/trunk/distribution/aggregations/base-runtime/src/main/resources/NOTICE index 1bfb4e16c3..1bfb4e16c3 100644 --- a/sca-java-2.x/trunk/shades/base/src/main/resources/NOTICE +++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime/src/main/resources/NOTICE diff --git a/sca-java-2.x/trunk/shades/base/src/main/resources/README.txt b/sca-java-2.x/trunk/distribution/aggregations/base-runtime/src/main/resources/README.txt index d8be6ae636..d8be6ae636 100644 --- a/sca-java-2.x/trunk/shades/base/src/main/resources/README.txt +++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime/src/main/resources/README.txt diff --git a/sca-java-2.x/trunk/distribution/pom.xml b/sca-java-2.x/trunk/distribution/pom.xml index cf06a26b6b..c85cee8304 100644 --- a/sca-java-2.x/trunk/distribution/pom.xml +++ b/sca-java-2.x/trunk/distribution/pom.xml @@ -31,6 +31,8 @@ <name>Apache Tuscany SCA Distributions</name> <modules> + <module>aggregations/base-runtime</module> + <module>aggregations/base-runtime-nodep</module> <module>aggregations/base-runtime-aggregation</module> <module>aggregations/binding-rmi-runtime-aggregation</module> <module>aggregations/binding-ws-runtime-axis2-aggregation</module> 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 e0bc900c6b..5fb6af2271 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 @@ -47,8 +47,8 @@ <version>2.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.apache.tuscany.sca.shades</groupId> - <artifactId>tuscany-base</artifactId> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> <!-- diff --git a/sca-java-2.x/trunk/maven/maven-tuscany-plugin/pom.xml b/sca-java-2.x/trunk/maven/maven-tuscany-plugin/pom.xml index 7096a30aa5..a9b45e4a0e 100644 --- a/sca-java-2.x/trunk/maven/maven-tuscany-plugin/pom.xml +++ b/sca-java-2.x/trunk/maven/maven-tuscany-plugin/pom.xml @@ -50,8 +50,8 @@ </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml index 28bfdbf411..9e4937e919 100644 --- a/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml +++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml @@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>org.apache.tuscany.sca.shades</groupId> - <artifactId>tuscany-base-nodep</artifactId> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-base-runtime-nodep</artifactId> <version>2.0-SNAPSHOT</version> </dependency> 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 5f28205da4..bcd090dad9 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 @@ -1,56 +1,56 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>sample-binding-comet</artifactId> - <packaging>war</packaging> - <version>1.0</version> - <name>Apache Tuscany SCA Sample binding.comet</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca.shades</groupId> - <artifactId>tuscany-base-nodep</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-comet-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>javax</groupId> - <artifactId>javaee-web-api</artifactId> - <version>6.0</version> - <scope>provided</scope> - </dependency> - </dependencies> - -</project> - +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-samples</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>sample-binding-comet</artifactId>
+ <packaging>war</packaging>
+ <version>1.0</version>
+ <name>Apache Tuscany SCA Sample binding.comet</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime-nodep</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-comet-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-web-api</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
+
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 326422ed7b..ed4dcd16f2 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 @@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>org.apache.tuscany.sca.shades</groupId> - <artifactId>tuscany-base</artifactId> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml index f414d87837..d9194a102c 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml @@ -34,8 +34,8 @@ <!-- Tuscany dependency -->
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base-nodep</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime-nodep</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
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 388df0913e..d064ecbf33 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 @@ -33,8 +33,8 @@ <dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml index 05a3e23895..f871af8cf5 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml @@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>org.apache.tuscany.sca.shades</groupId> - <artifactId>tuscany-base</artifactId> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml index 45725aaf72..d4dbe9eb6e 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml @@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>org.apache.tuscany.sca.shades</groupId> - <artifactId>tuscany-base-nodep</artifactId> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-base-runtime-nodep</artifactId> <version>2.0-SNAPSHOT</version> </dependency> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml index 16259aba62..f3c62210ef 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml @@ -34,8 +34,8 @@ <!-- Tuscany dependencies --> <dependency> - <groupId>org.apache.tuscany.sca.shades</groupId> - <artifactId>tuscany-base</artifactId> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml index 6197b12e50..701eca43ac 100644 --- a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml @@ -32,8 +32,8 @@ <dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml index 4e7f057ca9..de22d49ddd 100644 --- a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml @@ -32,8 +32,8 @@ <dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/pom.xml index aa0876b338..a9b1617afb 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/pom.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/pom.xml @@ -30,8 +30,8 @@ <dependencies> <dependency> - <groupId>org.apache.tuscany.sca.shades</groupId> - <artifactId>tuscany-base-nodep</artifactId> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-base-runtime-nodep</artifactId> <version>2.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml b/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml index 307adcf483..f30f5f899e 100644 --- a/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml +++ b/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml @@ -43,8 +43,8 @@ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/shades/bpel/pom.xml b/sca-java-2.x/trunk/shades/bpel/pom.xml index baa096015d..4fbfac8dfa 100644 --- a/sca-java-2.x/trunk/shades/bpel/pom.xml +++ b/sca-java-2.x/trunk/shades/bpel/pom.xml @@ -93,8 +93,8 @@ </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/shades/jms-nodep/pom.xml b/sca-java-2.x/trunk/shades/jms-nodep/pom.xml index f55209fe26..f0ffded58e 100644 --- a/sca-java-2.x/trunk/shades/jms-nodep/pom.xml +++ b/sca-java-2.x/trunk/shades/jms-nodep/pom.xml @@ -74,8 +74,8 @@ </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/shades/jms/pom.xml b/sca-java-2.x/trunk/shades/jms/pom.xml index 786be02392..859a9ae01d 100644 --- a/sca-java-2.x/trunk/shades/jms/pom.xml +++ b/sca-java-2.x/trunk/shades/jms/pom.xml @@ -85,8 +85,8 @@ </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/shades/json-nodep/pom.xml b/sca-java-2.x/trunk/shades/json-nodep/pom.xml index bcc4fe95e3..cf1b91b2de 100644 --- a/sca-java-2.x/trunk/shades/json-nodep/pom.xml +++ b/sca-java-2.x/trunk/shades/json-nodep/pom.xml @@ -40,8 +40,8 @@ </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/shades/json/pom.xml b/sca-java-2.x/trunk/shades/json/pom.xml index 6457dbc082..e20063db1d 100644 --- a/sca-java-2.x/trunk/shades/json/pom.xml +++ b/sca-java-2.x/trunk/shades/json/pom.xml @@ -128,8 +128,8 @@ </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/shades/pom.xml b/sca-java-2.x/trunk/shades/pom.xml index 712af5b2f0..ec593cf34f 100644 --- a/sca-java-2.x/trunk/shades/pom.xml +++ b/sca-java-2.x/trunk/shades/pom.xml @@ -31,8 +31,6 @@ <name>Apache Tuscany SCA Shaded Jars</name>
<modules>
- <module>base</module>
- <module>base-nodep</module>
<module>jms</module>
<module>json</module>
<module>json-nodep</module>
diff --git a/sca-java-2.x/trunk/shades/spring-nodep/pom.xml b/sca-java-2.x/trunk/shades/spring-nodep/pom.xml index 02e3dd43c9..33d6858cde 100644 --- a/sca-java-2.x/trunk/shades/spring-nodep/pom.xml +++ b/sca-java-2.x/trunk/shades/spring-nodep/pom.xml @@ -39,8 +39,8 @@ </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/shades/spring/pom.xml b/sca-java-2.x/trunk/shades/spring/pom.xml index 1697669788..b5f31e3235 100644 --- a/sca-java-2.x/trunk/shades/spring/pom.xml +++ b/sca-java-2.x/trunk/shades/spring/pom.xml @@ -72,8 +72,8 @@ </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml b/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml index 21e2e23aa3..b4aa5d6d94 100644 --- a/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml +++ b/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml @@ -37,8 +37,8 @@ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/shades/webservices/pom.xml b/sca-java-2.x/trunk/shades/webservices/pom.xml index b93086d222..9997c2294e 100644 --- a/sca-java-2.x/trunk/shades/webservices/pom.xml +++ b/sca-java-2.x/trunk/shades/webservices/pom.xml @@ -169,8 +169,8 @@ </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
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 223bbd80d2..a8dc567396 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 @@ -39,8 +39,8 @@ </dependency> <dependency> - <groupId>org.apache.tuscany.sca.shades</groupId> - <artifactId>tuscany-base</artifactId> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> diff --git a/sca-java-2.x/trunk/testing/itest/T3558/pom.xml b/sca-java-2.x/trunk/testing/itest/T3558/pom.xml index 5940901bf7..49f4619f71 100644 --- a/sca-java-2.x/trunk/testing/itest/T3558/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/T3558/pom.xml @@ -31,8 +31,8 @@ <dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml b/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml index ad407a10f7..fd2e5cee31 100644 --- a/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml @@ -31,8 +31,8 @@ <dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml b/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml index b568e5ba53..61073b8990 100644 --- a/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml @@ -30,8 +30,8 @@ <dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base-nodep</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime-nodep</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml b/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml index 2e95f157b8..1c115fb423 100644 --- a/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml @@ -31,8 +31,8 @@ <dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml index bc78b9a0b4..0f3c126281 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml @@ -31,8 +31,8 @@ <dependencies> <dependency> - <groupId>org.apache.tuscany.sca.shades</groupId> - <artifactId>tuscany-base</artifactId> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> diff --git a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/pom.xml b/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/pom.xml index 8254ce61a5..fb4bd349fb 100644 --- a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/pom.xml +++ b/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/pom.xml @@ -1,53 +1,53 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>sample-jsonp-webapp</artifactId> - <packaging>war</packaging> - <version>1.0</version> - <name>jsonp-webapp</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca.shades</groupId> - <artifactId>tuscany-base-nodep</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jsonp-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <type>jar</type> - </dependency> - </dependencies> - - <build> - <finalName>jsonp-webapp</finalName> - </build> -</project> - +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>sample-jsonp-webapp</artifactId>
+ <packaging>war</packaging>
+ <version>1.0</version>
+ <name>jsonp-webapp</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime-nodep</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-jsonp-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>jsonp-webapp</finalName>
+ </build>
+</project>
+
|