You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/06/17 09:20:48 UTC
svn commit: r785491 [4/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...
Modified: geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/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.plugins</groupId>
- <artifactId>console-tomcat</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>dojo-tomcat</artifactId>
<type>car</type>
@@ -26,4 +21,9 @@
<artifactId>plugin</artifactId>
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>console-tomcat</artifactId>
+ <type>car</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -8,6 +8,16 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>connector-deployer</artifactId>
+ <type>car</type>
+ </dependency>
+ <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</artifactId>
<type>car</type>
</dependency>
@@ -21,14 +31,4 @@
<artifactId>geronimo-webservices-builder</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.configs</groupId>
- <artifactId>connector-deployer</artifactId>
- <type>car</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -12,78 +12,78 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>server-security-config</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openjpa</artifactId>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>transaction</artifactId>
+ <artifactId>system-database</artifactId>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>system-database</artifactId>
+ <artifactId>transaction</artifactId>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>webservices-common</artifactId>
+ <type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-api</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>server-security-config</artifactId>
+ <type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-loader</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-openejb</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+ <artifactId>xbean-finder</artifactId>
+ <type>car</type>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-jee</artifactId>
+ <artifactId>openejb-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>xbean-asm-shaded</artifactId>
+ <artifactId>openejb-client</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>xbean-finder-shaded</artifactId>
+ <artifactId>openejb-core</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>xbean-reflect</artifactId>
+ <artifactId>openejb-ejbd</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.codehaus.swizzle</groupId>
- <artifactId>swizzle-stream</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>quartz</groupId>
- <artifactId>quartz</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-jee</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openejb</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-loader</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-ejbd</artifactId>
+ <artifactId>openejb-multicast</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -93,18 +93,18 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-client</artifactId>
+ <artifactId>xbean-asm-shaded</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-multicast</artifactId>
+ <artifactId>xbean-finder-shaded</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openjpa</artifactId>
- <type>car</type>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>xbean-reflect</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
@@ -112,13 +112,13 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>webservices-common</artifactId>
- <type>car</type>
+ <groupId>org.codehaus.swizzle</groupId>
+ <artifactId>swizzle-stream</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.plugins.classloaders</groupId>
- <artifactId>xbean-finder</artifactId>
- <type>car</type>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ <type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/openjpa/openjpa/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/openjpa/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/openjpa/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/openjpa/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,6 +7,11 @@
<type>car</type>
</module-id>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<type>jar</type>
@@ -17,14 +22,9 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>transaction</artifactId>
+ <type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -32,8 +32,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>transaction</artifactId>
- <type>car</type>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/persistence-jpa10-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>j2ee-deployer</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>transaction</artifactId>
<type>car</type>
</dependency>
@@ -16,9 +21,4 @@
<artifactId>geronimo-persistence-jpa10-builder</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-deployer</artifactId>
- <type>car</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/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>connector-deployer</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
<type>car</type>
</dependency>
@@ -17,9 +22,9 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-jetty</artifactId>
- <type>car</type>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
@@ -27,13 +32,8 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>console-jetty</artifactId>
<type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/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.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>connector-deployer</artifactId>
+ <type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -17,9 +17,9 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-tomcat</artifactId>
- <type>car</type>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
@@ -27,8 +27,8 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>console-tomcat</artifactId>
<type>car</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pluto-support/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.pluto</groupId>
- <artifactId>pluto-descriptor-api</artifactId>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.codehaus.castor</groupId>
- <artifactId>castor</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -22,8 +22,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -32,8 +32,8 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-pluto</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -43,12 +43,12 @@
</dependency>
<dependency>
<groupId>org.apache.pluto</groupId>
- <artifactId>pluto-taglib</artifactId>
+ <artifactId>pluto-descriptor-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptor-impl</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -57,18 +57,18 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-pluto</artifactId>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-portal-driver-impl</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.pluto</groupId>
- <artifactId>pluto-portal-driver-impl</artifactId>
+ <artifactId>pluto-taglib</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-descriptor-impl</artifactId>
+ <groupId>org.codehaus.castor</groupId>
+ <artifactId>castor</artifactId>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/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>geronimo-remote-deploy</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>xmlbeans</artifactId>
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-remote-deploy</artifactId>
+ <type>war</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/remote-deploy/remote-deploy-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>geronimo-remote-deploy</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>xmlbeans</artifactId>
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-remote-deploy</artifactId>
+ <type>war</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/spring/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/spring/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/spring/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/spring/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,24 +7,24 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>jee-specs</artifactId>
+ <type>car</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
+ <artifactId>spring-beans</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
+ <artifactId>spring-context</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>jee-specs</artifactId>
- <type>car</type>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-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>jsr88-rar-configurer</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -17,13 +17,13 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jsr88-rar-configurer</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>
+ <artifactId>plugin</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -32,23 +32,18 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>plugin</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-test-ddbean</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-local</artifactId>
- <type>rar</type>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>console-jetty</artifactId>
+ <type>car</type>
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-ra</artifactId>
+ <artifactId>tranql-connector-db2-xa</artifactId>
<type>rar</type>
</dependency>
<dependency>
@@ -63,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-db2-xa</artifactId>
+ <artifactId>tranql-connector-derby-embed-local</artifactId>
<type>rar</type>
</dependency>
<dependency>
@@ -88,12 +83,12 @@
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-xa</artifactId>
+ <artifactId>tranql-connector-oracle-rac-local</artifactId>
<type>rar</type>
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-rac-local</artifactId>
+ <artifactId>tranql-connector-oracle-xa</artifactId>
<type>rar</type>
</dependency>
<dependency>
@@ -108,6 +103,11 @@
</dependency>
<dependency>
<groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-ra</artifactId>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
<artifactId>tranql-connector-sqlserver2000-xa</artifactId>
<type>rar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/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-tomcat</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jsr88-rar-configurer</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -17,13 +17,13 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jsr88-rar-configurer</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>
+ <artifactId>plugin</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -32,23 +32,18 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>plugin</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-test-ddbean</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-local</artifactId>
- <type>rar</type>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>console-tomcat</artifactId>
+ <type>car</type>
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-ra</artifactId>
+ <artifactId>tranql-connector-db2-xa</artifactId>
<type>rar</type>
</dependency>
<dependency>
@@ -63,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-db2-xa</artifactId>
+ <artifactId>tranql-connector-derby-embed-local</artifactId>
<type>rar</type>
</dependency>
<dependency>
@@ -88,12 +83,12 @@
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-xa</artifactId>
+ <artifactId>tranql-connector-oracle-rac-local</artifactId>
<type>rar</type>
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-rac-local</artifactId>
+ <artifactId>tranql-connector-oracle-xa</artifactId>
<type>rar</type>
</dependency>
<dependency>
@@ -108,6 +103,11 @@
</dependency>
<dependency>
<groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-ra</artifactId>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
<artifactId>tranql-connector-sqlserver2000-xa</artifactId>
<type>rar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -7,11 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>derby</artifactId>
<type>car</type>
@@ -26,4 +21,9 @@
<artifactId>geronimo-derby</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-xa</artifactId>
+ <type>rar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-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>tomcat6-clustering-wadi</artifactId>
+ <type>car</type>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
@@ -16,9 +21,4 @@
<artifactId>geronimo-tomcat6-clustering-builder-wadi</artifactId>
<type>jar</type>
</dependency>
- <dependency start="true">
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-clustering-wadi</artifactId>
- <type>car</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/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-tomcat6-clustering-wadi</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-no-ha</artifactId>
<type>car</type>
@@ -21,4 +16,9 @@
<artifactId>wadi-clustering</artifactId>
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-tomcat6-clustering-wadi</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-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/tomcat/tomcat6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml Wed Jun 17 07:20:44 2009
@@ -12,8 +12,8 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>server-security-config</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -22,16 +22,6 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat6</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>clustering</artifactId>
- <type>pom</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>webservices-common</artifactId>
<type>car</type>
@@ -47,28 +37,38 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <type>car</type>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>tribes</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_1.0_spec</artifactId>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>util</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>server-security-config</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-tomcat6</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.ext.tomcat</groupId>
- <artifactId>util</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>clustering</artifactId>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.ext.tomcat</groupId>
- <artifactId>tribes</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/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.configs</groupId>
- <artifactId>jasper</artifactId>
- <type>car</type>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -17,18 +17,18 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-uddi-db</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>juddi</groupId>
- <artifactId>juddi</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
+ <type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-uddi-db</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/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.configs</groupId>
- <artifactId>jasper</artifactId>
- <type>car</type>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -17,18 +17,18 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-uddi-db</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>juddi</groupId>
- <artifactId>juddi</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
+ <type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-uddi-db</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml?rev=785491&r1=785490&r2=785491&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/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.framework</groupId>
- <artifactId>j2ee-security</artifactId>
- <type>car</type>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -17,14 +17,9 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.codehaus.castor</groupId>
- <artifactId>castor</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>j2ee-security</artifactId>
+ <type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
@@ -42,6 +37,16 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+ <artifactId>geronimo-schema-jee_5</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.castor</groupId>
+ <artifactId>castor</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<type>jar</type>
@@ -51,9 +56,4 @@
<artifactId>xml-resolver</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugins.classloaders</groupId>
- <artifactId>geronimo-schema-jee_5</artifactId>
- <type>car</type>
- </dependency>
</plugin-artifact>