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

12 files changed, 10 insertions, 8 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>
 <!--