geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r572544 - in /geronimo/plugins/tuscany/trunk: tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml tuscany-jetty/src/plan/plan.xml tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml tuscany-tomcat/src/plan/plan.xml
Date Tue, 04 Sep 2007 06:17:28 GMT
Author: vamsic007
Date: Mon Sep  3 23:17:28 2007
New Revision: 572544

URL: http://svn.apache.org/viewvc?rev=572544&view=rev
Log:
Rearranged the dependency order.  Eliminated some duplicates.

Modified:
    geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/plugins/tuscany/trunk/tuscany-jetty/src/plan/plan.xml
    geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/plan/plan.xml

Modified: geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml?rev=572544&r1=572543&r2=572544&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml Mon Sep  3 23:17:28 2007
@@ -37,6 +37,8 @@
         </description>
     </prerequisite>
 
+    <dependency>org.apache.geronimo.plugins/geronimo-tuscany-http-jetty/1.0-SNAPSHOT/jar</dependency>
+
     <dependency>annogen/annogen/0.1.0/jar</dependency>
     <dependency>backport-util-concurrent/backport-util-concurrent/2.2/jar</dependency>
     <dependency>com.sun.xml.bind/jaxb-xjc/2.0.5/jar</dependency>
@@ -56,6 +58,7 @@
     <dependency>org.apache.axis2/axis2-kernel/1.2/jar</dependency>
     <dependency>org.apache.axis2/axis2-metadata/1.2/jar</dependency>
     <dependency>org.apache.axis2/axis2-saaj/1.2/jar</dependency>
+
     <dependency>org.apache.geronimo.configs/geronimo-gbean-deployer//car</dependency>
     <dependency>org.apache.geronimo.configs/j2ee-corba-yoko//car</dependency>
     <dependency>org.apache.geronimo.configs/jasper//car</dependency>
@@ -63,49 +66,49 @@
     <dependency>org.apache.geronimo.configs/jetty6//car</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-axis2//jar</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-j2ee-schema//jar</dependency>
-    <dependency>org.apache.geronimo.plugins/geronimo-tuscany-http-jetty/1.0-SNAPSHOT/jar</dependency>
     <dependency>org.apache.geronimo.specs/geronimo-commonj_1.1_spec/1.0/jar</dependency>
+
     <dependency>org.apache.httpcomponents/httpcore/4.0-alpha5/jar</dependency>
     <dependency>org.apache.neethi/neethi/2.0/jar</dependency>
+
     <dependency>org.apache.tuscany.das/tuscany-das-rdb/${tuscanyDasVersion}/jar</dependency>
-    
     <dependency>org.apache.tuscany.sca/sca-api/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-assembly-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-assembly/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-assembly-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-ejb/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-feed/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-jms/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-jsonrpc/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-rmi/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-binding-sca-xml/${tuscanyVersion}</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-sca/${tuscanyVersion}</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-binding-sca-xml/${tuscanyVersion}</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-binding-ws/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-ws-axis2/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-ws-xml/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-binding-ws/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-contribution-impl/${tuscanyVersion}/ja</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-contribution/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-contribution-impl/${tuscanyVersion}/ja</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-core/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-core-databinding/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-core-spi/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-core/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-databinding-axiom/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-databinding/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-databinding-axiom/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-distributed/${tuscanyVersion}</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-extension-helper/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-host-embedded/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-host-http/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-host-rmi/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-implementation-java-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-implementation-java/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-interface-java-runtime/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-interface-java-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-implementation-java-runtime/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-implementation-java-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-interface-java/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface-java-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-interface/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-policy-xml/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-policy-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sdo/tuscany-sdo-impl/${tuscanySdoVersion}/jar</dependency>
+
     <dependency>org.apache.ws.commons.axiom/axiom-api/1.2.5/jar</dependency>
     <dependency>org.apache.ws.commons.axiom/axiom-dom/1.2.5/jar</dependency>
     <dependency>org.apache.ws.commons.axiom/axiom-impl/1.2.5/jar</dependency>

Modified: geronimo/plugins/tuscany/trunk/tuscany-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-jetty/src/plan/plan.xml?rev=572544&r1=572543&r2=572544&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-jetty/src/plan/plan.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-jetty/src/plan/plan.xml Mon Sep  3 23:17:28 2007
@@ -34,208 +34,217 @@
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
+
             <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>rmi-naming</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jetty6</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-corba-yoko</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-axis2</artifactId>
-                <version>${geronimoVersion}</version>
+                <groupId>annogen</groupId>
+                <artifactId>annogen</artifactId>
+                <version>0.1.0</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-j2ee-schema</artifactId>
-                <version>${geronimoVersion}</version>
+                <groupId>backport-util-concurrent</groupId>
+                <artifactId>backport-util-concurrent</artifactId>
+                <version>2.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-java2wsdl</artifactId>
-                <version>1.2</version>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-xjc</artifactId>
+                <version>2.0.5</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-kernel</artifactId>
-                <version>1.2</version>
+                <groupId>com.sun.xml.ws</groupId>
+                <artifactId>jaxws-rt</artifactId>
+                <version>2.0</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-adb</artifactId>
-                <version>1.2</version>
+                <groupId>com.sun.xml.ws</groupId>
+                <artifactId>jaxws-tools</artifactId>
+                <version>2.0</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-jaxws</artifactId>
-                <version>1.2</version>
+                <groupId>commonj</groupId>
+                <artifactId>sdo-api-r2.1</artifactId>
+                <version>1.0-incubating-SNAPSHOT</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-jaxws-api</artifactId>
-                <version>1.2</version>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.3</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-metadata</artifactId>
-                <version>1.2</version>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>1.1.1</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-saaj</artifactId>
-                <version>1.2</version>
+                <groupId>commons-httpclient</groupId>
+                <artifactId>commons-httpclient</artifactId>
+                <version>3.0.1</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpcore</artifactId>
-                <version>4.0-alpha5</version>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.0.4</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.ws.commons.axiom</groupId>
-                <artifactId>axiom-api</artifactId>
-                <version>1.2.5</version>
+                <groupId>jaxen</groupId>
+                <artifactId>jaxen</artifactId>
+                <version>1.1-beta-11</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.ws.commons.axiom</groupId>
-                <artifactId>axiom-dom</artifactId>
-                <version>1.2.5</version>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.14</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.ws.commons.axiom</groupId>
-                <artifactId>axiom-impl</artifactId>
-                <version>1.2.5</version>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-adb</artifactId>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.ws.commons.schema</groupId>
-                <artifactId>XmlSchema</artifactId>
-                <version>1.3.1</version>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-java2wsdl</artifactId>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.0.4</version>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-jaxws</artifactId>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>commons-httpclient</groupId>
-                <artifactId>commons-httpclient</artifactId>
-                <version>3.0.1</version>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-jaxws-api</artifactId>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>1.3</version>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-kernel</artifactId>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>jaxen</groupId>
-                <artifactId>jaxen</artifactId>
-                <version>1.1-beta-11</version>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-metadata</artifactId>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>annogen</groupId>
-                <artifactId>annogen</artifactId>
-                <version>0.1.0</version>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-saaj</artifactId>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
+            
+            <!-- Geronimo dependencies -->
             <dependency>
-                <groupId>xml-resolver</groupId>
-                <artifactId>xml-resolver</artifactId>
-                <version>1.1</version>
-                <type>jar</type>
-                <import>classes</import>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.neethi</groupId>
-                <artifactId>neethi</artifactId>
-                <version>2.0</version>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>j2ee-corba-yoko</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jasper</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>rmi-naming</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jetty6</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-axis2</artifactId>
+                <version>${geronimoVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>com.sun.xml.ws</groupId>
-                <artifactId>jaxws-tools</artifactId>
-                <version>2.0</version>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-j2ee-schema</artifactId>
+                <version>${geronimoVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>com.sun.xml.ws</groupId>
-                <artifactId>jaxws-rt</artifactId>
-                <version>2.0</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-commonj_1.1_spec</artifactId>
+                <version>1.0</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
+            
             <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-xjc</artifactId>
-                <version>2.0.5</version>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>4.0-alpha5</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>backport-util-concurrent</groupId>
-                <artifactId>backport-util-concurrent</artifactId>
-                <version>2.2</version>
+                <groupId>org.apache.neethi</groupId>
+                <artifactId>neethi</artifactId>
+                <version>2.0</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
+
+            <!-- Tuscany dependencies -->
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-commonj_1.1_spec</artifactId>
-                <version>1.0</version>
+                <groupId>org.apache.tuscany.das</groupId>
+                <artifactId>tuscany-das-rdb</artifactId>
+                <version>${tuscanyDasVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
-
-            <!-- Tuscany SCA -->
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>sca-api</artifactId>
@@ -259,254 +268,254 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-contribution</artifactId>
+                <artifactId>tuscany-binding-ejb</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-contribution-impl</artifactId>
+                <artifactId>tuscany-binding-feed</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-core</artifactId>
+                <artifactId>tuscany-binding-jms</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-core-databinding</artifactId>
+                <artifactId>tuscany-binding-jsonrpc</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-core-spi</artifactId>
+                <artifactId>tuscany-binding-rmi</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-databinding-axiom</artifactId>
+                <artifactId>tuscany-binding-sca</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-databinding</artifactId>
+                <artifactId>tuscany-binding-sca-xml</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-host-embedded</artifactId>
+                <artifactId>tuscany-binding-ws</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-policy</artifactId>
+                <artifactId>tuscany-binding-ws-axis2</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-policy-xml</artifactId>
+                <artifactId>tuscany-binding-ws-xml</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-host-http</artifactId>
+                <artifactId>tuscany-contribution</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-implementation-java</artifactId>
+                <artifactId>tuscany-contribution-impl</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-implementation-java-runtime</artifactId>
+                <artifactId>tuscany-core</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-implementation-java-xml</artifactId>
+                <artifactId>tuscany-core-databinding</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-interface</artifactId>
+                <artifactId>tuscany-core-spi</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-interface-java</artifactId>
+                <artifactId>tuscany-databinding</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-interface-java-xml</artifactId>
+                <artifactId>tuscany-databinding-axiom</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-ws</artifactId>
+                <artifactId>tuscany-distributed</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-ws-axis2</artifactId>
+                <artifactId>tuscany-extension-helper</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-ws-xml</artifactId>
+                <artifactId>tuscany-host-embedded</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-interface-wsdl</artifactId>
+                <artifactId>tuscany-host-http</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-interface-wsdl-xml</artifactId>
+                <artifactId>tuscany-host-rmi</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-policy</artifactId>
+                <artifactId>tuscany-implementation-java</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-host-rmi</artifactId>
+                <artifactId>tuscany-implementation-java-runtime</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-feed</artifactId>
+                <artifactId>tuscany-implementation-java-xml</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-jms</artifactId>
+                <artifactId>tuscany-interface</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-jsonrpc</artifactId>
+                <artifactId>tuscany-interface-java</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-rmi</artifactId>
+                <artifactId>tuscany-interface-java-xml</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-ejb</artifactId>
+                <artifactId>tuscany-interface-wsdl</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-sca</artifactId>
+                <artifactId>tuscany-interface-wsdl-xml</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-sca-xml</artifactId>
+                <artifactId>tuscany-policy</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-distributed</artifactId>
+                <artifactId>tuscany-policy-xml</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-extension-helper</artifactId>
-                <version>${tuscanyVersion}</version>
+                <groupId>org.apache.tuscany.sdo</groupId>
+                <artifactId>tuscany-sdo-impl</artifactId>
+                <version>${tuscanySdoVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
 
             <dependency>
-                <groupId>stax</groupId>
-                <artifactId>stax-api</artifactId>
-                <version>1.0.1</version>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-api</artifactId>
+                <version>1.2.5</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>wsdl4j</groupId>
-                <artifactId>wsdl4j</artifactId>
-                <version>1.6.1</version>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-dom</artifactId>
+                <version>1.2.5</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.woodstox</groupId>
-                <artifactId>wstx-asl</artifactId>
-                <version>3.2.0</version>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-impl</artifactId>
+                <version>1.2.5</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
@@ -518,45 +527,32 @@
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.14</version>
-                <type>jar</type>
-                <import>classes</import>
-            </dependency>
-            <dependency>
-                <groupId>commonj</groupId>
-                <artifactId>sdo-api-r2.1</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <groupId>org.codehaus.woodstox</groupId>
+                <artifactId>wstx-asl</artifactId>
+                <version>3.2.0</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>1.1.1</version>
+                <groupId>stax</groupId>
+                <artifactId>stax-api</artifactId>
+                <version>1.0.1</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.tuscany.das</groupId>
-                <artifactId>tuscany-das-rdb</artifactId>
-                <version>${tuscanyDasVersion}</version>
+                <groupId>wsdl4j</groupId>
+                <artifactId>wsdl4j</artifactId>
+                <version>1.6.1</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-impl</artifactId>
-                <version>${tuscanySdoVersion}</version>
+                <groupId>xml-resolver</groupId>
+                <artifactId>xml-resolver</artifactId>
+                <version>1.1</version>
                 <type>jar</type>
                 <import>classes</import>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>geronimo-gbean-deployer</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
             </dependency>
         </dependencies>
         <hidden-classes>

Modified: geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?rev=572544&r1=572543&r2=572544&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Mon Sep  3 23:17:28 2007
@@ -37,6 +37,8 @@
         </description>
     </prerequisite>
 
+    <dependency>org.apache.geronimo.plugins/geronimo-tuscany-http-tomcat/1.0-SNAPSHOT/jar</dependency>
+
     <dependency>annogen/annogen/0.1.0/jar</dependency>
     <dependency>backport-util-concurrent/backport-util-concurrent/2.2/jar</dependency>
     <dependency>com.sun.xml.bind/jaxb-xjc/2.0.5/jar</dependency>
@@ -56,6 +58,7 @@
     <dependency>org.apache.axis2/axis2-kernel/1.2/jar</dependency>
     <dependency>org.apache.axis2/axis2-metadata/1.2/jar</dependency>
     <dependency>org.apache.axis2/axis2-saaj/1.2/jar</dependency>
+
     <dependency>org.apache.geronimo.configs/geronimo-gbean-deployer//car</dependency>
     <dependency>org.apache.geronimo.configs/j2ee-corba-yoko//car</dependency>
     <dependency>org.apache.geronimo.configs/jasper//car</dependency>
@@ -63,49 +66,49 @@
     <dependency>org.apache.geronimo.configs/tomcat6//car</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-axis2//jar</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-j2ee-schema//jar</dependency>
-    <dependency>org.apache.geronimo.plugins/geronimo-tuscany-http-tomcat/1.0-SNAPSHOT/jar</dependency>
     <dependency>org.apache.geronimo.specs/geronimo-commonj_1.1_spec/1.0/jar</dependency>
+
     <dependency>org.apache.httpcomponents/httpcore/4.0-alpha5/jar</dependency>
     <dependency>org.apache.neethi/neethi/2.0/jar</dependency>
+
     <dependency>org.apache.tuscany.das/tuscany-das-rdb/${tuscanyDasVersion}/jar</dependency>
-    
     <dependency>org.apache.tuscany.sca/sca-api/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-assembly-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-assembly/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-assembly-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-ejb/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-feed/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-jms/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-jsonrpc/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-rmi/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-binding-sca-xml/${tuscanyVersion}</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-sca/${tuscanyVersion}</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-binding-sca-xml/${tuscanyVersion}</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-binding-ws/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-ws-axis2/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-ws-xml/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-binding-ws/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-contribution-impl/${tuscanyVersion}/ja</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-contribution/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-contribution-impl/${tuscanyVersion}/ja</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-core/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-core-databinding/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-core-spi/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-core/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-databinding-axiom/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-databinding/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-databinding-axiom/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-distributed/${tuscanyVersion}</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-extension-helper/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-host-embedded/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-host-http/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-host-rmi/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-implementation-java-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-implementation-java/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-interface-java-runtime/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-interface-java-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-implementation-java-runtime/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-implementation-java-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-interface-java/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface-java-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-interface/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-policy-xml/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-policy-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sdo/tuscany-sdo-impl/${tuscanySdoVersion}/jar</dependency>
+
     <dependency>org.apache.ws.commons.axiom/axiom-api/1.2.5/jar</dependency>
     <dependency>org.apache.ws.commons.axiom/axiom-dom/1.2.5/jar</dependency>
     <dependency>org.apache.ws.commons.axiom/axiom-impl/1.2.5/jar</dependency>

Modified: geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/plan/plan.xml?rev=572544&r1=572543&r2=572544&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/plan/plan.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/plan/plan.xml Mon Sep  3 23:17:28 2007
@@ -34,214 +34,217 @@
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
+
             <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>rmi-naming</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
+                <groupId>annogen</groupId>
+                <artifactId>annogen</artifactId>
+                <version>0.1.0</version>
+                <type>jar</type>
+                <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>tomcat6</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
+                <groupId>backport-util-concurrent</groupId>
+                <artifactId>backport-util-concurrent</artifactId>
+                <version>2.2</version>
+                <type>jar</type>
+                <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jasper</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-xjc</artifactId>
+                <version>2.0.5</version>
+                <type>jar</type>
+                <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-corba-yoko</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
+                <groupId>com.sun.xml.ws</groupId>
+                <artifactId>jaxws-rt</artifactId>
+                <version>2.0</version>
+                <type>jar</type>
+                <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-axis2</artifactId>
-                <version>${geronimoVersion}</version>
+                <groupId>com.sun.xml.ws</groupId>
+                <artifactId>jaxws-tools</artifactId>
+                <version>2.0</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-j2ee-schema</artifactId>
-                <version>${geronimoVersion}</version>
+                <groupId>commonj</groupId>
+                <artifactId>sdo-api-r2.1</artifactId>
+                <version>1.0-incubating-SNAPSHOT</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-java2wsdl</artifactId>
-                <version>1.2</version>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.3</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-kernel</artifactId>
-                <version>1.2</version>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>1.1.1</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-adb</artifactId>
-                <version>1.2</version>
+                <groupId>commons-httpclient</groupId>
+                <artifactId>commons-httpclient</artifactId>
+                <version>3.0.1</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-jaxws</artifactId>
-                <version>1.2</version>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.0.4</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-jaxws-api</artifactId>
-                <version>1.2</version>
+                <groupId>jaxen</groupId>
+                <artifactId>jaxen</artifactId>
+                <version>1.1-beta-11</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-metadata</artifactId>
-                <version>1.2</version>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.14</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-saaj</artifactId>
+                <artifactId>axis2-adb</artifactId>
                 <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpcore</artifactId>
-                <version>4.0-alpha5</version>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-java2wsdl</artifactId>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.ws.commons.axiom</groupId>
-                <artifactId>axiom-api</artifactId>
-                <version>1.2.5</version>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-jaxws</artifactId>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.ws.commons.axiom</groupId>
-                <artifactId>axiom-dom</artifactId>
-                <version>1.2.5</version>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-jaxws-api</artifactId>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.ws.commons.axiom</groupId>
-                <artifactId>axiom-impl</artifactId>
-                <version>1.2.5</version>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-kernel</artifactId>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.ws.commons.schema</groupId>
-                <artifactId>XmlSchema</artifactId>
-                <version>1.3.1</version>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-metadata</artifactId>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.0.4</version>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-saaj</artifactId>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
+
+            <!-- Geronimo dependencies -->
             <dependency>
-                <groupId>commons-httpclient</groupId>
-                <artifactId>commons-httpclient</artifactId>
-                <version>3.0.1</version>
-                <type>jar</type>
-                <import>classes</import>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
             </dependency>
             <dependency>
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>1.3</version>
-                <type>jar</type>
-                <import>classes</import>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>j2ee-corba-yoko</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
             </dependency>
             <dependency>
-                <groupId>jaxen</groupId>
-                <artifactId>jaxen</artifactId>
-                <version>1.1-beta-11</version>
-                <type>jar</type>
-                <import>classes</import>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jasper</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
             </dependency>
             <dependency>
-                <groupId>annogen</groupId>
-                <artifactId>annogen</artifactId>
-                <version>0.1.0</version>
-                <type>jar</type>
-                <import>classes</import>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>rmi-naming</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
             </dependency>
             <dependency>
-                <groupId>xml-resolver</groupId>
-                <artifactId>xml-resolver</artifactId>
-                <version>1.1</version>
-                <type>jar</type>
-                <import>classes</import>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>tomcat6</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.neethi</groupId>
-                <artifactId>neethi</artifactId>
-                <version>2.0</version>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-axis2</artifactId>
+                <version>${geronimoVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>com.sun.xml.ws</groupId>
-                <artifactId>jaxws-tools</artifactId>
-                <version>2.0</version>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-j2ee-schema</artifactId>
+                <version>${geronimoVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>com.sun.xml.ws</groupId>
-                <artifactId>jaxws-rt</artifactId>
-                <version>2.0</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-commonj_1.1_spec</artifactId>
+                <version>1.0</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
+
             <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-xjc</artifactId>
-                <version>2.0.5</version>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>4.0-alpha5</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>backport-util-concurrent</groupId>
-                <artifactId>backport-util-concurrent</artifactId>
-                <version>2.2</version>
+                <groupId>org.apache.neethi</groupId>
+                <artifactId>neethi</artifactId>
+                <version>2.0</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
+
+            <!-- Tuscany dependencies -->
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-commonj_1.1_spec</artifactId>
-                <version>1.0</version>
+                <groupId>org.apache.tuscany.das</groupId>
+                <artifactId>tuscany-das-rdb</artifactId>
+                <version>${tuscanyDasVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
-
-            <!-- Tuscany SCA -->
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>sca-api</artifactId>
@@ -265,254 +268,254 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-contribution</artifactId>
+                <artifactId>tuscany-binding-ejb</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-contribution-impl</artifactId>
+                <artifactId>tuscany-binding-feed</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-core</artifactId>
+                <artifactId>tuscany-binding-jms</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-core-databinding</artifactId>
+                <artifactId>tuscany-binding-jsonrpc</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-core-spi</artifactId>
+                <artifactId>tuscany-binding-rmi</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-databinding-axiom</artifactId>
+                <artifactId>tuscany-binding-sca</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-databinding</artifactId>
+                <artifactId>tuscany-binding-sca-xml</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-host-embedded</artifactId>
+                <artifactId>tuscany-binding-ws</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-policy</artifactId>
+                <artifactId>tuscany-binding-ws-axis2</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-policy-xml</artifactId>
+                <artifactId>tuscany-binding-ws-xml</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-host-http</artifactId>
+                <artifactId>tuscany-contribution</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-implementation-java</artifactId>
+                <artifactId>tuscany-contribution-impl</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-implementation-java-runtime</artifactId>
+                <artifactId>tuscany-core</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-implementation-java-xml</artifactId>
+                <artifactId>tuscany-core-databinding</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-interface</artifactId>
+                <artifactId>tuscany-core-spi</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-interface-java</artifactId>
+                <artifactId>tuscany-databinding</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-interface-java-xml</artifactId>
+                <artifactId>tuscany-databinding-axiom</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-ws</artifactId>
+                <artifactId>tuscany-distributed</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-ws-axis2</artifactId>
+                <artifactId>tuscany-extension-helper</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-ws-xml</artifactId>
+                <artifactId>tuscany-host-embedded</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-interface-wsdl</artifactId>
+                <artifactId>tuscany-host-http</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-interface-wsdl-xml</artifactId>
+                <artifactId>tuscany-host-rmi</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-policy</artifactId>
+                <artifactId>tuscany-implementation-java</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-host-rmi</artifactId>
+                <artifactId>tuscany-implementation-java-runtime</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-feed</artifactId>
+                <artifactId>tuscany-implementation-java-xml</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-jms</artifactId>
+                <artifactId>tuscany-interface</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-jsonrpc</artifactId>
+                <artifactId>tuscany-interface-java</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-rmi</artifactId>
+                <artifactId>tuscany-interface-java-xml</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-ejb</artifactId>
+                <artifactId>tuscany-interface-wsdl</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-sca</artifactId>
+                <artifactId>tuscany-interface-wsdl-xml</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-sca-xml</artifactId>
+                <artifactId>tuscany-policy</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-distributed</artifactId>
+                <artifactId>tuscany-policy-xml</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-extension-helper</artifactId>
-                <version>${tuscanyVersion}</version>
+                <groupId>org.apache.tuscany.sdo</groupId>
+                <artifactId>tuscany-sdo-impl</artifactId>
+                <version>${tuscanySdoVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
 
             <dependency>
-                <groupId>stax</groupId>
-                <artifactId>stax-api</artifactId>
-                <version>1.0.1</version>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-api</artifactId>
+                <version>1.2.5</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>wsdl4j</groupId>
-                <artifactId>wsdl4j</artifactId>
-                <version>1.6.1</version>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-dom</artifactId>
+                <version>1.2.5</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.woodstox</groupId>
-                <artifactId>wstx-asl</artifactId>
-                <version>3.2.0</version>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-impl</artifactId>
+                <version>1.2.5</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
@@ -524,45 +527,32 @@
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.14</version>
-                <type>jar</type>
-                <import>classes</import>
-            </dependency>
-            <dependency>
-                <groupId>commonj</groupId>
-                <artifactId>sdo-api-r2.1</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <groupId>org.codehaus.woodstox</groupId>
+                <artifactId>wstx-asl</artifactId>
+                <version>3.2.0</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>1.1.1</version>
+                <groupId>stax</groupId>
+                <artifactId>stax-api</artifactId>
+                <version>1.0.1</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.tuscany.das</groupId>
-                <artifactId>tuscany-das-rdb</artifactId>
-                <version>${tuscanyDasVersion}</version>
+                <groupId>wsdl4j</groupId>
+                <artifactId>wsdl4j</artifactId>
+                <version>1.6.1</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-impl</artifactId>
-                <version>${tuscanySdoVersion}</version>
+                <groupId>xml-resolver</groupId>
+                <artifactId>xml-resolver</artifactId>
+                <version>1.1</version>
                 <type>jar</type>
                 <import>classes</import>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>geronimo-gbean-deployer</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
             </dependency>
         </dependencies>
         <hidden-classes>



Mime
View raw message