You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2006/04/27 03:16:54 UTC
svn commit: r397352 - in /geronimo/branches/1.1/configs: client-corba/
client-security/ client/ console-jetty/ console-tomcat/ directory/
hot-deployer/ j2ee-corba/ j2ee-security/ j2ee-server/ jetty-deployer/
jetty/ jsp-examples-jetty/ jsp-examples-tomc...
Author: ammulder
Date: Wed Apr 26 18:16:48 2006
New Revision: 397352
URL: http://svn.apache.org/viewcvs?rev=397352&view=rev
Log:
Straighten out ActiveMQ dependencies (GERONIMO-1923)
Modified:
geronimo/branches/1.1/configs/client-corba/project.xml
geronimo/branches/1.1/configs/client-security/project.xml
geronimo/branches/1.1/configs/client/project.xml
geronimo/branches/1.1/configs/console-jetty/project.xml
geronimo/branches/1.1/configs/console-tomcat/project.xml
geronimo/branches/1.1/configs/directory/project.xml
geronimo/branches/1.1/configs/hot-deployer/project.xml
geronimo/branches/1.1/configs/j2ee-corba/project.xml
geronimo/branches/1.1/configs/j2ee-security/project.xml
geronimo/branches/1.1/configs/j2ee-server/project.xml
geronimo/branches/1.1/configs/jetty-deployer/project.xml
geronimo/branches/1.1/configs/jetty/project.xml
geronimo/branches/1.1/configs/jsp-examples-jetty/project.xml
geronimo/branches/1.1/configs/jsp-examples-tomcat/project.xml
geronimo/branches/1.1/configs/ldap-demo-jetty/project.xml
geronimo/branches/1.1/configs/ldap-demo-tomcat/project.xml
geronimo/branches/1.1/configs/ldap-realm/project.xml
geronimo/branches/1.1/configs/rmi-naming/project.xml
geronimo/branches/1.1/configs/servlets-examples-jetty/project.xml
geronimo/branches/1.1/configs/servlets-examples-tomcat/project.xml
geronimo/branches/1.1/configs/system-database/project.xml
geronimo/branches/1.1/configs/tomcat-deployer/project.xml
geronimo/branches/1.1/configs/tomcat/project.xml
geronimo/branches/1.1/configs/uddi-jetty/project.xml
geronimo/branches/1.1/configs/uddi-tomcat/project.xml
geronimo/branches/1.1/configs/welcome-jetty/project.xml
geronimo/branches/1.1/configs/welcome-tomcat/project.xml
Modified: geronimo/branches/1.1/configs/client-corba/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-corba/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-corba/project.xml (original)
+++ geronimo/branches/1.1/configs/client-corba/project.xml Wed Apr 26 18:16:48 2006
@@ -205,7 +205,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: geronimo/branches/1.1/configs/client-security/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-security/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-security/project.xml (original)
+++ geronimo/branches/1.1/configs/client-security/project.xml Wed Apr 26 18:16:48 2006
@@ -196,7 +196,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: geronimo/branches/1.1/configs/client/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client/project.xml (original)
+++ geronimo/branches/1.1/configs/client/project.xml Wed Apr 26 18:16:48 2006
@@ -253,7 +253,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: geronimo/branches/1.1/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-jetty/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/console-jetty/project.xml Wed Apr 26 18:16:48 2006
@@ -232,7 +232,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
<properties>
<geronimo.dependency>true</geronimo.dependency>
@@ -241,7 +241,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean</artifactId>
+ <artifactId>activemq-gbean-g1_1</artifactId>
<version>${activemq_version}</version>
<properties>
<geronimo.dependency>true</geronimo.dependency>
Modified: geronimo/branches/1.1/configs/console-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-tomcat/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/console-tomcat/project.xml Wed Apr 26 18:16:48 2006
@@ -226,7 +226,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
<properties>
<geronimo.dependency>true</geronimo.dependency>
@@ -235,7 +235,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean</artifactId>
+ <artifactId>activemq-gbean-g1_1</artifactId>
<version>${activemq_version}</version>
<properties>
<geronimo.dependency>true</geronimo.dependency>
Modified: geronimo/branches/1.1/configs/directory/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/directory/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/directory/project.xml (original)
+++ geronimo/branches/1.1/configs/directory/project.xml Wed Apr 26 18:16:48 2006
@@ -203,7 +203,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: geronimo/branches/1.1/configs/hot-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/hot-deployer/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/hot-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/hot-deployer/project.xml Wed Apr 26 18:16:48 2006
@@ -242,7 +242,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: geronimo/branches/1.1/configs/j2ee-corba/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-corba/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-corba/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-corba/project.xml Wed Apr 26 18:16:48 2006
@@ -211,7 +211,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: geronimo/branches/1.1/configs/j2ee-security/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-security/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-security/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-security/project.xml Wed Apr 26 18:16:48 2006
@@ -213,7 +213,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: geronimo/branches/1.1/configs/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-server/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-server/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-server/project.xml Wed Apr 26 18:16:48 2006
@@ -141,7 +141,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
<properties>
<geronimo.dependency>true</geronimo.dependency>
Modified: geronimo/branches/1.1/configs/jetty-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jetty-deployer/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jetty-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/jetty-deployer/project.xml Wed Apr 26 18:16:48 2006
@@ -200,7 +200,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: geronimo/branches/1.1/configs/jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jetty/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/jetty/project.xml Wed Apr 26 18:16:48 2006
@@ -199,7 +199,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: geronimo/branches/1.1/configs/jsp-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jsp-examples-jetty/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jsp-examples-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/jsp-examples-jetty/project.xml Wed Apr 26 18:16:48 2006
@@ -245,11 +245,7 @@
<artifactId>asm</artifactId>
<version>${asm_version}</version>
</dependency>
- <dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
- <version>${activemq_version}</version>
- </dependency>
+
<dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
Modified: geronimo/branches/1.1/configs/jsp-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jsp-examples-tomcat/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jsp-examples-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/jsp-examples-tomcat/project.xml Wed Apr 26 18:16:48 2006
@@ -235,11 +235,7 @@
<artifactId>asm</artifactId>
<version>${asm_version}</version>
</dependency>
- <dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
- <version>${activemq_version}</version>
- </dependency>
+
<dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
Modified: geronimo/branches/1.1/configs/ldap-demo-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-demo-jetty/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/ldap-demo-jetty/project.xml Wed Apr 26 18:16:48 2006
@@ -239,11 +239,6 @@
<version>${asm_version}</version>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
- <version>${activemq_version}</version>
- </dependency>
- <dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>${activeio_version}</version>
Modified: geronimo/branches/1.1/configs/ldap-demo-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-demo-tomcat/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/ldap-demo-tomcat/project.xml Wed Apr 26 18:16:48 2006
@@ -231,11 +231,6 @@
<version>${asm_version}</version>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
- <version>${activemq_version}</version>
- </dependency>
- <dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>${activeio_version}</version>
Modified: geronimo/branches/1.1/configs/ldap-realm/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-realm/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-realm/project.xml (original)
+++ geronimo/branches/1.1/configs/ldap-realm/project.xml Wed Apr 26 18:16:48 2006
@@ -107,11 +107,6 @@
<version>${asm_version}</version>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
- <version>${activemq_version}</version>
- </dependency>
- <dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>${activeio_version}</version>
Modified: geronimo/branches/1.1/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/rmi-naming/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/rmi-naming/project.xml (original)
+++ geronimo/branches/1.1/configs/rmi-naming/project.xml Wed Apr 26 18:16:48 2006
@@ -243,7 +243,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
</dependency>
<!-- remote login -->
Modified: geronimo/branches/1.1/configs/servlets-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/servlets-examples-jetty/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/servlets-examples-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/servlets-examples-jetty/project.xml Wed Apr 26 18:16:48 2006
@@ -236,11 +236,6 @@
<version>${asm_version}</version>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
- <version>${activemq_version}</version>
- </dependency>
- <dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>${activeio_version}</version>
Modified: geronimo/branches/1.1/configs/servlets-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/servlets-examples-tomcat/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/servlets-examples-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/servlets-examples-tomcat/project.xml Wed Apr 26 18:16:48 2006
@@ -236,11 +236,6 @@
<version>${asm_version}</version>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
- <version>${activemq_version}</version>
- </dependency>
- <dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>${activeio_version}</version>
Modified: geronimo/branches/1.1/configs/system-database/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/system-database/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/system-database/project.xml (original)
+++ geronimo/branches/1.1/configs/system-database/project.xml Wed Apr 26 18:16:48 2006
@@ -258,7 +258,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: geronimo/branches/1.1/configs/tomcat-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/tomcat-deployer/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/tomcat-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/tomcat-deployer/project.xml Wed Apr 26 18:16:48 2006
@@ -202,7 +202,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: geronimo/branches/1.1/configs/tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/tomcat/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/tomcat/project.xml Wed Apr 26 18:16:48 2006
@@ -191,7 +191,7 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: geronimo/branches/1.1/configs/uddi-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/uddi-jetty/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/uddi-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/uddi-jetty/project.xml Wed Apr 26 18:16:48 2006
@@ -271,11 +271,6 @@
<version>${asm_version}</version>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
- <version>${activemq_version}</version>
- </dependency>
- <dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>${activeio_version}</version>
Modified: geronimo/branches/1.1/configs/uddi-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/uddi-tomcat/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/uddi-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/uddi-tomcat/project.xml Wed Apr 26 18:16:48 2006
@@ -286,11 +286,6 @@
<version>${asm_version}</version>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
- <version>${activemq_version}</version>
- </dependency>
- <dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>${activeio_version}</version>
Modified: geronimo/branches/1.1/configs/welcome-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/welcome-jetty/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/welcome-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/welcome-jetty/project.xml Wed Apr 26 18:16:48 2006
@@ -236,11 +236,6 @@
<version>${asm_version}</version>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
- <version>${activemq_version}</version>
- </dependency>
- <dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>${activeio_version}</version>
Modified: geronimo/branches/1.1/configs/welcome-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/welcome-tomcat/project.xml?rev=397352&r1=397351&r2=397352&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/welcome-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/welcome-tomcat/project.xml Wed Apr 26 18:16:48 2006
@@ -229,11 +229,6 @@
<version>${asm_version}</version>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
- <version>${activemq_version}</version>
- </dependency>
- <dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>${activeio_version}</version>