Update more things for base + extensions approach

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1033523 13f79535-47bb-0310-9956-ffa450edef68

14 files changed, 96 insertions, 105 deletions

diff --git a/sca-java-2.x/trunk/features/web20/pom.xml b/sca-java-2.x/trunk/features/web20/pom.xml
index 393787c112..73c8d43b57 100644
--- a/sca-java-2.x/trunk/features/web20/pom.xml
+++ b/sca-java-2.x/trunk/features/web20/pom.xml
@@ -87,6 +87,11 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
index 8b44a0c558..a44303b6a8 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
@@ -34,42 +34,49 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rest</artifactId>
             <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
             <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
             <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
             <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
             <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
             <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
             <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -82,6 +89,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
             <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml b/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml
index 600d7ecb39..b4e26dc316 100644
--- a/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml
+++ b/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml
@@ -31,41 +31,19 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <type>pom</type>
             <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
             <version>3.5.0-v20090520</version>
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.6</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
     </dependencies>
 
 
diff --git a/sca-java-2.x/trunk/modules/extensibility-equinox/pom.xml b/sca-java-2.x/trunk/modules/extensibility-equinox/pom.xml
index 6643dd01d6..20c3d72088 100644
--- a/sca-java-2.x/trunk/modules/extensibility-equinox/pom.xml
+++ b/sca-java-2.x/trunk/modules/extensibility-equinox/pom.xml
@@ -30,8 +30,10 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <type>pom</type>
             <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/implementation-osgi/pom.xml b/sca-java-2.x/trunk/modules/implementation-osgi/pom.xml
index f007a637fa..75f5e949bd 100644
--- a/sca-java-2.x/trunk/modules/implementation-osgi/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-osgi/pom.xml
@@ -43,21 +43,10 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <type>pom</type>
             <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml b/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml
index cb9d4dd5fb..a04547f4e5 100644
--- a/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml
+++ b/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml
@@ -37,17 +37,13 @@
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <type>pom</type>
+            <scope>provided</scope>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.8.1</version>
@@ -58,7 +54,7 @@
         	<artifactId>asm</artifactId>
         	<version>3.1</version>
         	<type>jar</type>
-        	<scope>compile</scope>
+        	<scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml b/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml
index 750ed73bc9..78002f79a5 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml
@@ -85,7 +85,15 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <type>pom</type>
+            <scope>provided</scope>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
+            <scope>provided</scope>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml b/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
index b26ca52daa..b31d1e6d9f 100644
--- a/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
+++ b/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
@@ -67,23 +67,19 @@
 -->
 
         <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.2</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
+            <type>pom</type>
             <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>1.2</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
@@ -98,12 +94,6 @@
             <scope>test</scope>
         </dependency-->
 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/sca-java-2.x/trunk/samples/applications/store/pom.xml b/sca-java-2.x/trunk/samples/applications/store/pom.xml
index 6386a58525..f9f65b9d3d 100644
--- a/sca-java-2.x/trunk/samples/applications/store/pom.xml
+++ b/sca-java-2.x/trunk/samples/applications/store/pom.xml
@@ -31,7 +31,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-node-impl</artifactId>
+			<artifactId>tuscany-base-runtime</artifactId>
 			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
@@ -43,12 +43,54 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-web20</artifactId>
-            <type>pom</type>
+            <artifactId>tuscany-binding-atom-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-atom-js-dojo</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc-js-dojo</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-widget-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-web-javascript-dojo</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>                
         
         <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.19</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
             <version>2.6</version>
diff --git a/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml
index 0fce800a3d..7ec143e4ed 100644
--- a/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml
@@ -32,38 +32,22 @@
     <dependencies>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-api</artifactId>

-            <type>pom</type>

+            <artifactId>tuscany-base-runtime</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>  

         

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency> 

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-webservice</artifactId>

-            <type>pom</type>

+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-web20</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

+            <groupId>org.mortbay.jetty</groupId>

+            <artifactId>jetty</artifactId>

+            <version>6.1.19</version>

         </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-webapp</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

+        

         <dependency>

             <groupId>junit</groupId>

             <artifactId>junit</artifactId>

diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml
index df09091cf7..4a33c10971 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml
@@ -33,9 +33,8 @@
     <dependencies>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime-pom</artifactId>

+            <artifactId>tuscany-base-runtime</artifactId>

             <version>2.0-SNAPSHOT</version>

-            <type>pom</type>

         </dependency>

         <dependency>

             <groupId>junit</groupId>

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 42ccfb5773..291273b2eb 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
@@ -34,9 +34,8 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-base-runtime-pom</artifactId>
+            <artifactId>tuscany-base-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
-            <type>pom</type>
         </dependency>         
 
         <dependency>
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/pom.xml
index 084f1146db..4e5119ea5d 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/pom.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/pom.xml
@@ -31,20 +31,12 @@
     <dependencies>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime-pom</artifactId>

+            <artifactId>tuscany-base-runtime</artifactId>

             <version>2.0-SNAPSHOT</version>

-            <type>pom</type>

         </dependency> 

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-osgi-runtime-pom</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency> 

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-binding-rmi-runtime</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>        

diff --git a/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml
index 14907c0974..d5df7fdbbc 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml
@@ -31,8 +31,7 @@
     <dependencies>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime-pom</artifactId>

-            <type>pom</type>

+            <artifactId>tuscany-base-runtime</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>