more base + extension updates

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

8 files changed, 49 insertions, 33 deletions

diff --git a/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml b/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml
index 16dce9f922..427bba3f45 100644
--- a/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml
@@ -30,24 +30,60 @@
     <name>Apache Tuscany SCA Sample Getting Started Online Store as WebApp</name>
 
     <dependencies>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-base-runtime</artifactId>
+			<version>2.0-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-data-api</artifactId>
+			<version>2.0-SNAPSHOT</version>
+		</dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
+            <artifactId>tuscany-binding-atom-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
+            <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-feature-web20</artifactId>
-            <type>pom</type>
+            <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>junit</groupId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
index 9cd866d6bb..1e339d8d0d 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
@@ -31,8 +31,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-api</artifactId>
-            <type>pom</type>
+            <artifactId>tuscany-sca-api</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
        
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
index 2d770ccd19..ffaf2d15eb 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
@@ -31,8 +31,7 @@
     <dependencies>

         <dependency>

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

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

-            <type>pom</type>

+            <artifactId>tuscany-sca-api</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency> 

 

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
index 2fa51a4656..ff434d28da 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
@@ -32,15 +32,7 @@
     <dependencies>

         <dependency>

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

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

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency> 

-

-        <dependency>

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

-            <artifactId>tuscany-feature-webapp</artifactId>

-            <type>pom</type>

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

             <version>2.0-SNAPSHOT</version>

         </dependency> 

 

@@ -51,12 +43,6 @@
         </dependency>

         

         <dependency>

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

-            <artifactId>tuscany-databinding-json</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>  

-        

-        <dependency>

            <groupId>org.dojotoolkit</groupId>

            <artifactId>dojo</artifactId>

            <version>1.3.0</version>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
index 3b4e03ddcc..688eec7314 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
@@ -31,8 +31,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-api</artifactId>
-            <type>pom</type>
+            <artifactId>tuscany-sca-api</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency> 
 
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
index c436b2288a..edc6c4f387 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
@@ -31,8 +31,7 @@
     <dependencies>

         <dependency>

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

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

-            <type>pom</type>

+            <artifactId>tuscany-sca-api</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>     

         

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
index 8008b97488..3782f60128 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
@@ -31,8 +31,7 @@
     <dependencies>

         <dependency>

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

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

-            <type>pom</type>

+            <artifactId>tuscany-sca-api</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

        

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
index 65436d1cea..3930949766 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
@@ -31,8 +31,7 @@
     <dependencies>

         <dependency>

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

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

-            <type>pom</type>

+            <artifactId>tuscany-sca-api</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>