TUSCANY-3674 Update this base description (which isn't being used as far as I know) to reference those modules required to run the assembly otests. Am looking at using this to add meta-data to the bin distro to allow users identify the base set of jars in the modules directory if required.

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

1 files changed, 98 insertions, 140 deletions

diff --git a/sca-java-2.x/trunk/features/base/pom.xml b/sca-java-2.x/trunk/features/base/pom.xml
index 0a57d60374..1c3a46e8f4 100644
--- a/sca-java-2.x/trunk/features/base/pom.xml
+++ b/sca-java-2.x/trunk/features/base/pom.xml
@@ -26,268 +26,226 @@
         <relativePath>../pom.xml</relativePath>

     </parent>

 

-    <artifactId>tuscany-feature-base</artifactId>

-    <name>Apache Tuscany SCA Base Feature</name>

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

+    <name>Apache Tuscany SCA Base Runtime</name>

     <packaging>pom</packaging>

 

+    <!-- 

+         The dependencies required to run the Assembly otests minus the web service 

+         binding (which is only required by the otest framework). Provides a minimum

+         set of function for running composites using implementation.java and local 

+         wiring. Other extensions can be added to this base when required 

+    -->

     <dependencies>

+        <dependency>

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

+            <artifactId>tuscany-assembly</artifactId>

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

+        </dependency>

 

         <dependency>

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

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

+            <artifactId>tuscany-assembly-xml</artifactId>

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

         </dependency>

+

         <dependency>

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

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

+            <artifactId>tuscany-assembly-xsd</artifactId>

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

         </dependency>

+

         <dependency>

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

-            <artifactId>tuscany-launcher</artifactId>

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

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

         </dependency>

+

         <dependency>

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

-            <artifactId>tuscany-endpoint-hazelcast</artifactId>

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

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

         </dependency>

+

         <dependency>

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

-            <artifactId>tuscany-endpoint-hazelcast-client</artifactId>

+            <artifactId>tuscany-builder</artifactId>

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

         </dependency>

-        <!-- dependency>

+

+        <dependency>

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

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

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

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

-        </dependency -->

+        </dependency>

+

         <dependency>

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

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

+            <artifactId>tuscany-common-xml</artifactId>

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

         </dependency>

+

         <dependency>

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

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

+            <artifactId>tuscany-contribution</artifactId>

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

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-contribution-osgi</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-binding-hazelcast-runtime</artifactId>

+            <artifactId>tuscany-core</artifactId>

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

         </dependency>

 

         <dependency>

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

-            <artifactId>tuscany-shell</artifactId>

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

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

         </dependency>

 

         <dependency>

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

-            <artifactId>tuscany-stripes</artifactId>

+            <artifactId>tuscany-core-spi</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-wink</artifactId>

+            <artifactId>tuscany-databinding</artifactId>

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

         </dependency>

 

         <dependency>

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

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

+            <artifactId>tuscany-databinding-jaxb</artifactId>

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

         </dependency>

 

         <dependency>

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

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

+            <artifactId>tuscany-deployment</artifactId>

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

         </dependency>

 

         <dependency>

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

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

+            <artifactId>tuscany-extensibility</artifactId>

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

         </dependency>

+

         <dependency>

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

-            <artifactId>tuscany-host-rmi</artifactId>

+            <artifactId>tuscany-extensibility-equinox</artifactId>

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

         </dependency>

 

         <dependency>

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

-            <artifactId>tuscany-contribution-osgi</artifactId>

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

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

-            <exclusions>

-                <exclusion>

-                    <groupId>org.eclipse</groupId>

-                    <artifactId>osgi</artifactId>

-                </exclusion>

-            </exclusions>

         </dependency>

+

         <dependency>

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

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

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

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

-            <exclusions>

-                <exclusion>

-                    <groupId>org.eclipse</groupId>

-                    <artifactId>osgi</artifactId>

-                </exclusion>

-            </exclusions>

         </dependency>

+

         <dependency>

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

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

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

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

-            <exclusions>

-                <exclusion>

-                    <groupId>org.eclipse</groupId>

-                    <artifactId>osgi</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.eclipse.osgi</groupId>

-                    <artifactId>services</artifactId>

-                </exclusion>

-            </exclusions>

         </dependency>

+

         <dependency>

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

-            <artifactId>tuscany-extensibility-equinox</artifactId>

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

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

-            <exclusions>

-                <exclusion>

-                    <groupId>org.eclipse</groupId>

-                    <artifactId>osgi</artifactId>

-                </exclusion>

-            </exclusions>

         </dependency>

+

+<!-- This is dependency of node-impl-osgi but not sure why-->

         <dependency>

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

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

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

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

+        </dependency>

+

+        <dependency>

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

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

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

-            <exclusions>

-                <exclusion>

-                    <groupId>org.eclipse</groupId>

-                    <artifactId>osgi</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>javax.servlet</groupId>

-                    <artifactId>servlet-api</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>commons-cli</groupId>

-                    <artifactId>commons-cli</artifactId>

-                </exclusion>

-            </exclusions>

         </dependency>

 

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

+        <dependency>

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

+            <artifactId>tuscany-interface-java-jaxws</artifactId>

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

+        </dependency>

 

         <dependency>

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

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

-            <version>1.0.1</version>

-            <scope>provided</scope>

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

+            <artifactId>tuscany-interface-wsdl</artifactId>

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

         </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>

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

+            <artifactId>tuscany-monitor</artifactId>

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

         </dependency>

 

         <dependency>

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

-            <artifactId>jaxb-api</artifactId>

-            <version>2.1</version>

-            <scope>provided</scope>

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

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

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

         </dependency>

 

         <dependency>

-            <groupId>javax.activation</groupId>

-            <artifactId>activation</artifactId>

-            <version>1.1</version>

-            <scope>provided</scope>

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

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

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

         </dependency>

 

         <dependency>

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

-            <artifactId>jaxb-impl</artifactId>

-            <version>2.1.12</version>

-            <scope>provided</scope>

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

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

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

         </dependency>

 

+        <dependency>

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

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

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

+        </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>

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

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

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

         </dependency>

 

         <dependency>

-            <groupId>javax.annotation</groupId>

-            <artifactId>jsr250-api</artifactId>

-            <version>1.0</version>

-            <scope>provided</scope>

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

+            <artifactId>tuscany-policy-security</artifactId>

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

         </dependency>

 

         <dependency>

-            <groupId>javax.jws</groupId>

-            <artifactId>jsr181-api</artifactId>

-            <version>1.0-MR1</version>

-            <scope>provided</scope>

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

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

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

         </dependency>

 

         <dependency>

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

-            <artifactId>stax-api</artifactId>

-            <version>1.0-2</version>

-            <scope>provided</scope>

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

+            <artifactId>tuscany-xsd</artifactId>

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

         </dependency>

 

     </dependencies>