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

11 files changed, 76 insertions, 76 deletions

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>