geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r785491 [3/4] - in /geronimo/server/trunk: framework/configs/client-system/src/main/history/ framework/configs/geronimo-boilerplate/src/main/history/ framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/ framework/configs/ge...
Date Wed, 17 Jun 2009 07:20:48 GMT
Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,23 +7,23 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-deployer</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-deploy-jsr88</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console-tomcat</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-deployer</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>plugin</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>plugin</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>console-tomcat</artifactId>
         <type>car</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,24 +7,14 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-rmi-impl</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-spec-corba</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.bcel</groupId>
         <artifactId>bcel</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-yoko</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>client</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
@@ -37,13 +27,23 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>client</artifactId>
-        <type>car</type>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-yoko</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-core</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.yoko</groupId>
+        <artifactId>yoko-rmi-impl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.yoko</groupId>
+        <artifactId>yoko-spec-corba</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,21 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-rmi-impl</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.bcel</groupId>
         <artifactId>bcel</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-yoko</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openejb</artifactId>
         <type>car</type>
@@ -32,8 +22,18 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-yoko</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-core</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.yoko</groupId>
+        <artifactId>yoko-rmi-impl</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -8,22 +8,22 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-deployer</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openejb-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-corba-builder</artifactId>
+        <artifactId>geronimo-corba</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-deployer</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-corba</artifactId>
+        <artifactId>geronimo-corba-builder</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -6,6 +6,11 @@
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>cxf</artifactId>
+        <type>car</type>
+    </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>jaxws-deployer</artifactId>
@@ -13,7 +18,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>cxf</artifactId>
+        <artifactId>jaxws-sun-tools</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -21,9 +26,4 @@
         <artifactId>geronimo-cxf-builder</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jaxws-sun-tools</artifactId>
-        <type>car</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -8,13 +8,13 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>cxf-ejb</artifactId>
+        <artifactId>cxf-deployer</artifactId>
         <type>car</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-cxf-ejb-builder</artifactId>
-        <type>jar</type>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>cxf-ejb</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
@@ -22,8 +22,8 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>cxf-deployer</artifactId>
-        <type>car</type>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-cxf-ejb-builder</artifactId>
+        <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,11 +7,6 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-cxf-ejb</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>cxf</artifactId>
         <type>car</type>
@@ -21,4 +16,9 @@
         <artifactId>openejb</artifactId>
         <type>car</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-cxf-ejb</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -2,133 +2,133 @@
 <plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>cxf-tools</artifactId>
+        <artifactId>cxf-jaxws-tools</artifactId>
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jaxws-deployer</artifactId>
-        <type>car</type>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-xjc</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>spring</artifactId>
-        <type>car</type>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-cxf-tools</artifactId>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-core</artifactId>
+        <artifactId>cxf-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-bindings-soap</artifactId>
+        <artifactId>cxf-common-schemas</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-simple</artifactId>
+        <artifactId>cxf-common-utilities</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools-java2ws</artifactId>
+        <artifactId>cxf-rt-bindings-soap</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-databinding-jaxb</artifactId>
+        <artifactId>cxf-rt-bindings-xml</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-api</artifactId>
+        <artifactId>cxf-rt-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools-common</artifactId>
+        <artifactId>cxf-rt-databinding-jaxb</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-common-utilities</artifactId>
+        <artifactId>cxf-rt-frontend-jaxws</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.neethi</groupId>
-        <artifactId>neethi</artifactId>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-simple</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-xjc</artifactId>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-ws-addr</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.ws.commons.schema</groupId>
-        <artifactId>XmlSchema</artifactId>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-tools-common</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-bindings-xml</artifactId>
+        <artifactId>cxf-tools-java2ws</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-jaxws</artifactId>
+        <artifactId>cxf-tools-validator</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-ws-addr</artifactId>
+        <artifactId>cxf-tools-wsdlto-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.velocity</groupId>
-        <artifactId>velocity</artifactId>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jaxws-deployer</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-common-schemas</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>spring</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools-validator</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-cxf-tools</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools-wsdlto-core</artifactId>
+        <groupId>org.apache.neethi</groupId>
+        <artifactId>neethi</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
+        <groupId>org.apache.ws.commons.schema</groupId>
+        <artifactId>XmlSchema</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -8,37 +8,27 @@
     </module-id>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools-common</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.ws.commons.schema</groupId>
-        <artifactId>XmlSchema</artifactId>
+        <artifactId>cxf-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-core</artifactId>
+        <artifactId>cxf-common-utilities</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-api</artifactId>
+        <artifactId>cxf-rt-bindings-soap</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-bindings-soap</artifactId>
+        <artifactId>cxf-rt-bindings-xml</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>transaction</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-simple</artifactId>
+        <artifactId>cxf-rt-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -48,18 +38,13 @@
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-bindings-xml</artifactId>
+        <artifactId>cxf-rt-frontend-jaxws</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>webservices-common</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>spring</artifactId>
-        <type>car</type>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-simple</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
@@ -72,19 +57,29 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.neethi</groupId>
-        <artifactId>neethi</artifactId>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-ws-security</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-cxf</artifactId>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-tools-common</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-jaxws</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>spring</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>transaction</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>webservices-common</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
@@ -92,23 +87,28 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-common-utilities</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-cxf</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-ws-security</artifactId>
+        <groupId>org.apache.neethi</groupId>
+        <artifactId>neethi</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.ws.security</groupId>
-        <artifactId>wss4j</artifactId>
+        <groupId>org.apache.santuario</groupId>
+        <artifactId>xmlsec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.santuario</groupId>
-        <artifactId>xmlsec</artifactId>
+        <groupId>org.apache.ws.commons.schema</groupId>
+        <artifactId>XmlSchema</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.ws.security</groupId>
+        <artifactId>wss4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -8,17 +8,12 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jasper</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console-jetty</artifactId>
+        <artifactId>dojo-legacy-jetty6</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>dojo-legacy-jetty6</artifactId>
+        <artifactId>jasper</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -26,4 +21,9 @@
         <artifactId>geronimo-gbean-deployer</artifactId>
         <type>car</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>console-jetty</artifactId>
+        <type>car</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -12,13 +12,13 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console-tomcat</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-gbean-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-gbean-deployer</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>console-tomcat</artifactId>
         <type>car</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/derby/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/derby/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/derby/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/derby/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -8,22 +8,22 @@
     </module-id>
     <dependency>
         <groupId>org.apache.derby</groupId>
-        <artifactId>derbynet</artifactId>
+        <artifactId>derby</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.derby</groupId>
-        <artifactId>derbytools</artifactId>
+        <artifactId>derbyclient</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.derby</groupId>
-        <artifactId>derbyclient</artifactId>
+        <artifactId>derbynet</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.derby</groupId>
-        <artifactId>derby</artifactId>
+        <artifactId>derbytools</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-deployer</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-deploy-jsr88</artifactId>
         <type>jar</type>
@@ -17,11 +22,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-deployer</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>plugin</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -6,59 +6,59 @@
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-server</artifactId>
+        <type>car</type>
+    </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-security-builder</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-gbean-deployer</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>server-security-config</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-naming-builder</artifactId>
+        <artifactId>geronimo-j2ee-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
-        <artifactId>xbean-finder</artifactId>
-        <type>car</type>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-j2ee-schema</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.schema</groupId>
-        <artifactId>geronimo-schema-j2ee_1.4</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-naming-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee-builder</artifactId>
+        <artifactId>geronimo-security-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-gbean-deployer</artifactId>
-        <type>car</type>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-web-2.5-builder</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.plugins.classloaders</groupId>
         <artifactId>geronimo-schema-jee_5</artifactId>
         <type>car</type>
     </dependency>
-    <dependency start="true">
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-server</artifactId>
-        <type>car</type>
-    </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee-schema</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency start="true">
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>server-security-config</artifactId>
+        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+        <artifactId>xbean-finder</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-web-2.5-builder</artifactId>
+        <groupId>org.apache.geronimo.schema</groupId>
+        <artifactId>geronimo-schema-j2ee_1.4</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,13 +7,13 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>rmi-naming</artifactId>
         <type>car</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-j2ee</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -6,6 +6,16 @@
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deployment</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-management</artifactId>
+        <type>jar</type>
+    </dependency>
     <dependency start="true">
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>jsr88-cli</artifactId>
@@ -18,27 +28,17 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee-builder</artifactId>
+        <artifactId>geronimo-j2ee</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee-schema</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deployment</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
+        <artifactId>geronimo-j2ee-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.schema</groupId>
-        <artifactId>geronimo-schema-jee_5</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-j2ee-schema</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -47,13 +47,8 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-management</artifactId>
+        <groupId>org.apache.geronimo.schema</groupId>
+        <artifactId>geronimo-schema-jee_5</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -66,4 +61,9 @@
         <artifactId>xbean-finder</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>xml-resolver</groupId>
+        <artifactId>xml-resolver</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -6,29 +6,29 @@
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
-    <dependency start="true">
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>jsr88-cli</artifactId>
-        <type>car</type>
+    <dependency>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-connector</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-client-builder</artifactId>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-transaction</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-client</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-naming</artifactId>
+        <artifactId>geronimo-management</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-naming</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-naming</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -41,19 +41,19 @@
         <artifactId>jee-specs</artifactId>
         <type>car</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee</artifactId>
-        <type>jar</type>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>jsr88-cli</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-management</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-client</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-connector-builder</artifactId>
+        <artifactId>geronimo-client-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -62,38 +62,38 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.components</groupId>
-        <artifactId>geronimo-connector</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-connector-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.components</groupId>
-        <artifactId>geronimo-transaction</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-j2ee</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.objectweb.howl</groupId>
-        <artifactId>howl</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-j2ee-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-transaction</artifactId>
+        <artifactId>geronimo-j2ee-schema</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-core</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-naming-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-naming-builder</artifactId>
+        <artifactId>geronimo-security-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee-builder</artifactId>
+        <artifactId>geronimo-transaction</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -102,23 +102,23 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-security-builder</artifactId>
+        <groupId>org.apache.geronimo.schema</groupId>
+        <artifactId>geronimo-schema-jee_5</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee-schema</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-finder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.schema</groupId>
-        <artifactId>geronimo-schema-jee_5</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-naming</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-finder</artifactId>
+        <groupId>org.objectweb.howl</groupId>
+        <artifactId>howl</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -6,84 +6,84 @@
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
-    <dependency start="true">
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>jsr88-cli</artifactId>
-        <type>car</type>
-    </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-web-2.5-builder</artifactId>
+        <groupId>com.envoisolutions.sxc</groupId>
+        <artifactId>sxc-jaxb</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-naming-builder</artifactId>
+        <groupId>com.envoisolutions.sxc</groupId>
+        <artifactId>sxc-runtime</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee-builder</artifactId>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-jaspi</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee-schema</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-management</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.schema</groupId>
-        <artifactId>geronimo-schema-jee_5</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-naming</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.schema</groupId>
-        <artifactId>geronimo-schema-j2ee_1.4</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-security</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>jsr88-cli</artifactId>
+        <type>car</type>
+    </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-j2ee</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-management</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-j2ee-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-j2ee-schema</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-finder</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-naming-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-naming</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-security-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-naming</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-web-2.5-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jta_1.1_spec</artifactId>
+        <groupId>org.apache.geronimo.schema</groupId>
+        <artifactId>geronimo-schema-j2ee_1.4</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-security-builder</artifactId>
+        <groupId>org.apache.geronimo.schema</groupId>
+        <artifactId>geronimo-schema-jee_5</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-security</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -97,18 +97,23 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.components</groupId>
-        <artifactId>geronimo-jaspi</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaspic_1.0_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.envoisolutions.sxc</groupId>
-        <artifactId>sxc-jaxb</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jta_1.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.envoisolutions.sxc</groupId>
-        <artifactId>sxc-runtime</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-finder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-naming</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,13 +7,18 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-server</artifactId>
-        <type>car</type>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>server-security-config</artifactId>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant-launcher</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-server</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -22,13 +27,13 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-jasper</artifactId>
+        <groupId>org.apache.geronimo.ext.tomcat</groupId>
+        <artifactId>jasper</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.ext.tomcat</groupId>
-        <artifactId>jasper</artifactId>
+        <artifactId>jasper-el</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -42,13 +47,13 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.ant</groupId>
-        <artifactId>ant</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>server-security-config</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.ant</groupId>
-        <artifactId>ant-launcher</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-jasper</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -56,9 +61,4 @@
         <artifactId>core</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.ext.tomcat</groupId>
-        <artifactId>jasper-el</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/javamail/javamail/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/javamail/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/javamail/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/javamail/javamail/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,13 +7,13 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-mail</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>rmi-naming</artifactId>
         <type>car</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-mail</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -6,19 +6,19 @@
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
-    <dependency>
+    <dependency start="true">
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-deployer</artifactId>
         <type>car</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-jaxws-builder</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
+    <dependency start="true">
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>webservices-common</artifactId>
         <type>car</type>
     </dependency>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-jaxws-builder</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -8,6 +8,11 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jaxws-deployer</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openejb-deployer</artifactId>
         <type>car</type>
     </dependency>
@@ -16,9 +21,4 @@
         <artifactId>geronimo-jaxws-ejb-builder</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jaxws-deployer</artifactId>
-        <type>car</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -2,23 +2,13 @@
 <plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jaxws-tools</artifactId>
+        <artifactId>jaxws-sun-tools</artifactId>
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jaxws-deployer</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-jaxws-sun-tools</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.jvnet.staxex</groupId>
-        <artifactId>stax-ex</artifactId>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-xjc</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -37,8 +27,18 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-xjc</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jaxws-deployer</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-jaxws-sun-tools</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.jvnet.staxex</groupId>
+        <artifactId>stax-ex</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -6,6 +6,11 @@
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jetty6-clustering-wadi</artifactId>
+        <type>car</type>
+    </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>jetty6-deployer</artifactId>
@@ -16,9 +21,4 @@
         <artifactId>geronimo-jetty6-clustering-builder-wadi</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency start="true">
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jetty6-clustering-wadi</artifactId>
-        <type>car</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,9 +7,9 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-jetty6-clustering-wadi</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jetty6</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
@@ -17,8 +17,8 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jetty6</artifactId>
-        <type>car</type>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-jetty6-clustering-wadi</artifactId>
+        <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -8,12 +8,12 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-deployer</artifactId>
+        <artifactId>connector-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>connector-deployer</artifactId>
+        <artifactId>j2ee-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency start="true">

Modified: geronimo/server/trunk/plugins/jetty/jetty6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -12,13 +12,18 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>server-security-config</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>transaction</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>transaction</artifactId>
+        <artifactId>webservices-common</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>server-security-config</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -27,28 +32,23 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>webservices-common</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-util</artifactId>
+        <artifactId>jetty-ajp</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-ajp</artifactId>
+        <artifactId>jetty-sslengine</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-sslengine</artifactId>
+        <artifactId>jetty-util</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jetty7/jetty7-clustering-builder-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7-clustering-builder-wadi/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/jetty7-clustering-builder-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/jetty7-clustering-builder-wadi/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -8,6 +8,11 @@
     </module-id>
     <dependency start="true">
         <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jetty7-clustering-wadi</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>jetty7-deployer</artifactId>
         <type>car</type>
     </dependency>
@@ -16,9 +21,4 @@
         <artifactId>geronimo-jetty7-clustering-builder-wadi</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency start="true">
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jetty7-clustering-wadi</artifactId>
-        <type>car</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,9 +7,9 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-jetty7-clustering-wadi</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jetty7</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
@@ -18,10 +18,20 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>wadi-clustering</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>webservices-common</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-jetty7-clustering-wadi</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-jaspi</artifactId>
         <type>jar</type>
@@ -33,27 +43,17 @@
     </dependency>
     <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-webapp</artifactId>
+        <artifactId>jetty-servlet</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-xml</artifactId>
+        <artifactId>jetty-webapp</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-servlet</artifactId>
+        <artifactId>jetty-xml</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jetty7</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>wadi-clustering</artifactId>
-        <type>car</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jetty7/jetty7-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7-deployer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/jetty7-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/jetty7-deployer/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -8,12 +8,12 @@
     </module-id>
     <dependency start="true">
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-deployer</artifactId>
+        <artifactId>connector-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency start="true">
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>connector-deployer</artifactId>
+        <artifactId>j2ee-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency start="true">

Modified: geronimo/server/trunk/plugins/jetty7/jetty7/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/jetty7/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/jetty7/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -12,16 +12,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>server-security-config</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-jetty7</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>transaction</artifactId>
         <type>car</type>
@@ -32,38 +22,48 @@
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>server-security-config</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-jetty7</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-ajp</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-jaspi</artifactId>
+        <artifactId>jetty-continuation</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-security</artifactId>
+        <artifactId>jetty-http</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-server</artifactId>
+        <artifactId>jetty-io</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-webapp</artifactId>
+        <artifactId>jetty-jaspi</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-xml</artifactId>
+        <artifactId>jetty-security</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-util</artifactId>
+        <artifactId>jetty-server</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -73,17 +73,17 @@
     </dependency>
     <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-continuation</artifactId>
+        <artifactId>jetty-util</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-http</artifactId>
+        <artifactId>jetty-webapp</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-io</artifactId>
+        <artifactId>jetty-xml</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/monitoring/agent-car-jmx/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-car-jmx/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-car-jmx/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-car-jmx/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -8,13 +8,13 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-        <artifactId>agent-jar</artifactId>
-        <type>jar</type>
+        <artifactId>agent-ds</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-        <artifactId>agent-ds</artifactId>
-        <type>car</type>
+        <artifactId>agent-jar</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>

Modified: geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
-        <groupId>org.apache.geronimo.plugins</groupId>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>agent-ds</artifactId>
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-        <artifactId>agent-sql</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>system-database</artifactId>
         <type>car</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+        <artifactId>agent-sql</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/monitoring/agent/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,9 +7,9 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-        <artifactId>agent-jar</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>mejb</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
@@ -17,8 +17,8 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>mejb</artifactId>
-        <type>car</type>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+        <artifactId>agent-jar</artifactId>
+        <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-ds/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-ds/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-ds/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-ds/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
-        <groupId>org.apache.geronimo.plugins</groupId>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>mconsole-ds</artifactId>
         <version>2.2-SNAPSHOT</version>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,13 +7,13 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-        <artifactId>mconsole-ds</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>dojo-jetty6</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console-jetty</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>openejb</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -22,13 +22,13 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>openejb</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>console-jetty</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>dojo-jetty6</artifactId>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+        <artifactId>mconsole-ds</artifactId>
         <type>car</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,33 +7,33 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console-tomcat</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>dojo-tomcat</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>j2ee-security</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>openejb</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-        <artifactId>mconsole-ds</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>openjpa</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>openjpa</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>j2ee-security</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>openejb</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>console-tomcat</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>dojo-tomcat</artifactId>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+        <artifactId>mconsole-ds</artifactId>
         <type>car</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/myfaces/myfaces-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces-deployer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces-deployer/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,18 +7,18 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-myfaces-builder</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-deployer</artifactId>
+        <type>car</type>
     </dependency>
-    <dependency>
+    <dependency start="true">
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>myfaces</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-deployer</artifactId>
-        <type>car</type>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-myfaces-builder</artifactId>
+        <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,14 +7,14 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-server</artifactId>
-        <type>car</type>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>commons-collections</groupId>
@@ -22,11 +22,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-myfaces</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>commons-digester</groupId>
         <artifactId>commons-digester</artifactId>
         <type>jar</type>
@@ -37,13 +32,18 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.myfaces.core</groupId>
-        <artifactId>myfaces-impl</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-server</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-myfaces</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-beanutils</groupId>
-        <artifactId>commons-beanutils</artifactId>
+        <groupId>org.apache.myfaces.core</groupId>
+        <artifactId>myfaces-impl</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -6,7 +6,7 @@
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
-    <dependency>
+    <dependency start="true">
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openejb-clustering-wadi</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -8,12 +8,12 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>wadi-clustering</artifactId>
+        <artifactId>openejb</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>openejb</artifactId>
+        <artifactId>wadi-clustering</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,8 +7,8 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console-jetty</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>dojo-jetty6</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -22,8 +22,8 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>dojo-jetty6</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>console-jetty</artifactId>
         <type>car</type>
     </dependency>
 </plugin-artifact>



Mime
View raw message