Update base-runtime to more closely match old shades/base, and all the scdl models to base, associated test updates to match that, and change the comet binding to use base + extension approach. Still need to look at whats in core-runtime vs base-runtime and still need to work out what really should/shouldn't be in base but at least its all consistent to start with now

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

1 files changed, 209 insertions, 12 deletions

diff --git a/sca-java-2.x/trunk/features/base-runtime/pom.xml b/sca-java-2.x/trunk/features/base-runtime/pom.xml
index 4c638a72d7..d9c301472c 100644
--- a/sca-java-2.x/trunk/features/base-runtime/pom.xml
+++ b/sca-java-2.x/trunk/features/base-runtime/pom.xml
@@ -39,50 +39,81 @@
     <dependencies>

         <dependency>

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

-            <artifactId>tuscany-core-runtime</artifactId>

+            <artifactId>tuscany-domain-node</artifactId>

             <version>${pom.version}</version>

-            <type>pom</type>

         </dependency>

-

         <dependency>

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

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

+            <artifactId>tuscany-implementation-web-runtime</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-launcher</artifactId>

             <version>${pom.version}</version>

         </dependency>

-

         <dependency>

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

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

+            <artifactId>tuscany-sca-client-impl</artifactId>

             <version>${pom.version}</version>

         </dependency>

+        <dependency>

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

+            <artifactId>tuscany-host-jetty</artifactId>

+            <version>${pom.version}</version>

+            <exclusions>

+                <exclusion>

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

+                    <artifactId>tuscany-core-spi</artifactId>

+                </exclusion>

+                <exclusion>

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

+                    <artifactId>jetty</artifactId>

+                </exclusion>

+                <exclusion>

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

+                    <artifactId>jetty-util</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>javax.servlet</groupId>

+                    <artifactId>servlet-api</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

 

         <dependency>

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

-            <artifactId>tuscany-implementation-java</artifactId>

+            <artifactId>tuscany-shell</artifactId>

             <version>${pom.version}</version>

         </dependency>

 

         <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <artifactId>tuscany-stripes</artifactId>

             <version>${pom.version}</version>

+            <exclusions>

+                <exclusion>

+                   <groupId>net.sourceforge.stripes</groupId>

+                   <artifactId>stripes</artifactId>

+                </exclusion>

+            </exclusions>

         </dependency>

 

         <dependency>

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

-            <artifactId>tuscany-implementation-web-runtime</artifactId>

+            <artifactId>tuscany-wink</artifactId>

             <version>${pom.version}</version>

         </dependency>

 

         <dependency>

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

-            <artifactId>tuscany-node-impl</artifactId>

+            <artifactId>tuscany-binding-ws-runtime-jaxws-ri</artifactId>

             <version>${pom.version}</version>

         </dependency>

 

         <dependency>

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

-            <artifactId>tuscany-node-launcher</artifactId>

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

             <version>${pom.version}</version>

         </dependency>

 

@@ -92,11 +123,177 @@
             <version>${pom.version}</version>

         </dependency>

 

+<!-- All the scdl modules  -->

+

         <dependency>

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

-            <artifactId>tuscany-sca-client-impl</artifactId>

+            <artifactId>tuscany-binding-atom</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-comet</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-corba</artifactId>

             <version>${pom.version}</version>

         </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-ejb</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-http</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-jms</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-jsonp</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-jsonrpc</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-rest</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

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

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

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

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

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

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-implementation-bpel</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-implementation-java</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <!-- dependency>

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

+            <artifactId>tuscany-implementation-jaxrs</artifactId>

+            <version>${pom.version}</version>

+        </dependency -->

+        <dependency>

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

+            <artifactId>tuscany-implementation-script</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-implementation-spring</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-implementation-web</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-implementation-widget</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+

+<!-- these remaining dependencies are not required when using JDK6, so use a scope of provided  -->

+

+        <dependency>

+            <groupId>org.apache.geronimo.specs</groupId>

+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>

+            <version>1.0.1</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.codehaus.woodstox</groupId>

+            <artifactId>wstx-asl</artifactId>

+            <version>3.2.4</version>

+            <scope>provided</scope>

+            <exclusions>

+                <exclusion>

+                    <groupId>stax</groupId>

+                    <artifactId>stax-api</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.xml.bind</groupId>

+            <artifactId>jaxb-api</artifactId>

+            <version>2.1</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.activation</groupId>

+            <artifactId>activation</artifactId>

+            <version>1.1</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>com.sun.xml.bind</groupId>

+            <artifactId>jaxb-impl</artifactId>

+            <version>2.1.12</version>

+            <scope>provided</scope>

+        </dependency>

+

+

+        <dependency>

+            <groupId>javax.xml.ws</groupId>

+            <artifactId>jaxws-api</artifactId>

+            <version>2.1</version>

+            <scope>provided</scope>

+            <exclusions>

+                <exclusion>

+                    <groupId>javax.xml.soap</groupId>

+                    <artifactId>saaj-api</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.annotation</groupId>

+            <artifactId>jsr250-api</artifactId>

+            <version>1.0</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.jws</groupId>

+            <artifactId>jsr181-api</artifactId>

+            <version>1.0-MR1</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.xml.stream</groupId>

+            <artifactId>stax-api</artifactId>

+            <version>1.0-2</version>

+            <scope>provided</scope>

+        </dependency>

+

 

     </dependencies>