You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/12/09 16:38:25 UTC
svn commit: r724760 - in /geronimo/server/trunk: ./
plugingroups/javaee5-jetty/ plugingroups/javaee5-jetty/src/main/history/
plugingroups/javaee5-tomcat/ plugingroups/javaee5-tomcat/src/main/history/
plugins/ plugins/activemq/ plugins/activemq/activemq...
Author: dwoods
Date: Tue Dec 9 07:38:24 2008
New Revision: 724760
URL: http://svn.apache.org/viewvc?rev=724760&view=rev
Log:
GERONIMO-4337 rename AMQ5 modules to old names that apps expect
Modified:
geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml
geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml
geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-ra/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-ra/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/activemq/activemq-server/pom.xml
geronimo/server/trunk/plugins/activemq/geronimo-activemq-management/pom.xml
geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml
geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml
geronimo/server/trunk/plugins/activemq/pom.xml
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/jms-plan.xml
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/jms-plan.xml
geronimo/server/trunk/plugins/openejb/openejb/pom.xml
geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/pom.xml
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml
geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml
Modified: geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml Tue Dec 9 07:38:24 2008
@@ -141,7 +141,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>${activemqString}-ra</artifactId>
+ <artifactId>activemq-ra</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
@@ -177,7 +177,7 @@
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>${activemqString}-console-jetty</artifactId>
+ <artifactId>activemq-console-jetty</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml Tue Dec 9 07:38:24 2008
@@ -78,7 +78,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq5-ra</artifactId>
+ <artifactId>activemq-ra</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -103,7 +103,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5-console-jetty</artifactId>
+ <artifactId>activemq-console-jetty</artifactId>
<type>car</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml Tue Dec 9 07:38:24 2008
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>${activemqString}-ra</artifactId>
+ <artifactId>activemq-ra</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
@@ -169,7 +169,7 @@
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>${activemqString}-console-tomcat</artifactId>
+ <artifactId>activemq-console-tomcat</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml Tue Dec 9 07:38:24 2008
@@ -73,7 +73,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq5-ra</artifactId>
+ <artifactId>activemq-ra</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -98,7 +98,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5-console-tomcat</artifactId>
+ <artifactId>activemq-console-tomcat</artifactId>
<type>car</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml Tue Dec 9 07:38:24 2008
@@ -24,16 +24,16 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5</artifactId>
+ <artifactId>activemq</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq5-broker</artifactId>
- <name>Geronimo Plugins, ActiveMQ5 :: Broker</name>
+ <artifactId>activemq-broker</artifactId>
+ <name>Geronimo Plugins, ActiveMQ v5 :: Broker</name>
<packaging>car</packaging>
- <description>Apache ActiveMQ 5 integration into geronimo. This module starts an activemq broker embedded in geronimo.</description>
+ <description>Apache ActiveMQ v5 integration into geronimo. This module starts an activemq broker embedded in geronimo.</description>
<dependencies>
<dependency>
@@ -54,13 +54,13 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq5</artifactId>
+ <artifactId>geronimo-activemq</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq5-management</artifactId>
+ <artifactId>geronimo-activemq-management</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml Tue Dec 9 07:38:24 2008
@@ -2,7 +2,7 @@
<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>activemq5-broker</artifactId>
+ <artifactId>activemq-broker</artifactId>
<version>2.2-SNAPSHOT</version>
<type>car</type>
</module-id>
@@ -13,12 +13,12 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq5</artifactId>
+ <artifactId>geronimo-activemq</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq5-management</artifactId>
+ <artifactId>geronimo-activemq-management</artifactId>
<type>jar</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml Tue Dec 9 07:38:24 2008
@@ -24,18 +24,18 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5</artifactId>
+ <artifactId>activemq</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
- <artifactId>activemq5-console-jetty</artifactId>
- <name>Geronimo Plugins, ActiveMQ5 :: Console (Jetty)</name>
+ <artifactId>activemq-console-jetty</artifactId>
+ <name>Geronimo Plugins, ActiveMQ v5 :: Console (Jetty)</name>
<packaging>car</packaging>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5-portlets</artifactId>
+ <artifactId>activemq-portlets</artifactId>
<version>${version}</version>
<type>war</type>
<scope>provided</scope>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq5-ra</artifactId>
+ <artifactId>activemq-ra</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq5-ra</artifactId>
+ <artifactId>geronimo-activemq-ra</artifactId>
<version>${version}</version>
<type>rar</type>
<exclusions>
@@ -171,7 +171,7 @@
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5-portlets</artifactId>
+ <artifactId>activemq-portlets</artifactId>
<version>${version}</version>
<type>war</type>
</module>
Modified: geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml Tue Dec 9 07:38:24 2008
@@ -2,7 +2,7 @@
<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>
- <artifactId>activemq5-console-jetty</artifactId>
+ <artifactId>activemq-console-jetty</artifactId>
<version>2.2-SNAPSHOT</version>
<type>car</type>
</module-id>
@@ -18,7 +18,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq5-ra</artifactId>
+ <artifactId>geronimo-activemq-ra</artifactId>
<type>rar</type>
</dependency>
<dependency>
@@ -28,7 +28,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq5-ra</artifactId>
+ <artifactId>activemq-ra</artifactId>
<type>car</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml Tue Dec 9 07:38:24 2008
@@ -24,18 +24,18 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5</artifactId>
+ <artifactId>activemq</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
- <artifactId>activemq5-console-tomcat</artifactId>
- <name>Geronimo Plugins, ActiveMQ5 :: Console (Tomcat)</name>
+ <artifactId>activemq-console-tomcat</artifactId>
+ <name>Geronimo Plugins, ActiveMQ v5 :: Console (Tomcat)</name>
<packaging>car</packaging>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5-portlets</artifactId>
+ <artifactId>activemq-portlets</artifactId>
<version>${version}</version>
<type>war</type>
<scope>provided</scope>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq5-ra</artifactId>
+ <artifactId>activemq-ra</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq5-ra</artifactId>
+ <artifactId>geronimo-activemq-ra</artifactId>
<version>${version}</version>
<type>rar</type>
<exclusions>
@@ -162,7 +162,7 @@
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5-portlets</artifactId>
+ <artifactId>activemq-portlets</artifactId>
<version>${version}</version>
<type>war</type>
</module>
Modified: geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml Tue Dec 9 07:38:24 2008
@@ -2,7 +2,7 @@
<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>
- <artifactId>activemq5-console-tomcat</artifactId>
+ <artifactId>activemq-console-tomcat</artifactId>
<version>2.2-SNAPSHOT</version>
<type>car</type>
</module-id>
@@ -13,7 +13,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq5-ra</artifactId>
+ <artifactId>geronimo-activemq-ra</artifactId>
<type>rar</type>
</dependency>
<dependency>
@@ -23,7 +23,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq5-ra</artifactId>
+ <artifactId>activemq-ra</artifactId>
<type>car</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml Tue Dec 9 07:38:24 2008
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5</artifactId>
+ <artifactId>activemq</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
- <artifactId>activemq5-portlets</artifactId>
- <name>Geronimo Plugins, ActiveMQ5 :: Portlets</name>
+ <artifactId>activemq-portlets</artifactId>
+ <name>Geronimo Plugins, ActiveMQ v5 :: Portlets</name>
<packaging>war</packaging>
<dependencies>
@@ -105,7 +105,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq5</artifactId>
+ <artifactId>geronimo-activemq</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/plugins/activemq/activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-ra/pom.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-ra/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-ra/pom.xml Tue Dec 9 07:38:24 2008
@@ -24,29 +24,29 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5</artifactId>
+ <artifactId>activemq</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq5-ra</artifactId>
- <name>Geronimo Plugins, ActiveMQ5 :: Resource Adapter</name>
+ <artifactId>activemq-ra</artifactId>
+ <name>Geronimo Plugins, ActiveMQ v5 :: Resource Adapter</name>
<packaging>car</packaging>
- <description>Geronimo ActiveMQ5 integration: ActiveMQ5 resource adapter connecting to (embedded) activemq broker.</description>
+ <description>Geronimo ActiveMQ v5 integration: ActiveMQ v5 resource adapter connecting to (embedded) activemq broker.</description>
<dependencies>
<!-- parent config -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq5-broker</artifactId>
+ <artifactId>activemq-broker</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq5-ra</artifactId>
+ <artifactId>geronimo-activemq-ra</artifactId>
<version>${version}</version>
<type>rar</type>
<scope>test</scope>
@@ -74,7 +74,7 @@
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq5-ra</artifactId>
+ <artifactId>geronimo-activemq-ra</artifactId>
<version>${version}</version>
<type>rar</type>
</module>
Modified: geronimo/server/trunk/plugins/activemq/activemq-ra/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-ra/src/main/history/dependencies.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-ra/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-ra/src/main/history/dependencies.xml Tue Dec 9 07:38:24 2008
@@ -2,13 +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>activemq5-ra</artifactId>
+ <artifactId>activemq-ra</artifactId>
<version>2.2-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq5-broker</artifactId>
+ <artifactId>activemq-broker</artifactId>
<type>car</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/activemq/activemq-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-server/pom.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-server/pom.xml Tue Dec 9 07:38:24 2008
@@ -20,16 +20,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>activemq5</artifactId>
+ <artifactId>activemq</artifactId>
<groupId>org.apache.geronimo.plugins</groupId>
<version>2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5-server</artifactId>
+ <artifactId>activemq-server</artifactId>
<packaging>server-assembly</packaging>
- <name>Geronimo ActiveMQ Micro-Server</name>
- <description>Small server for testing activemq5 integration</description>
+ <name>Geronimo ActiveMQ v5 Micro-Server</name>
+ <description>Small server for testing activemq v5 integration</description>
<dependencies>
<dependency>
@@ -40,19 +40,19 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq5-broker</artifactId>
+ <artifactId>activemq-broker</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq5-ra</artifactId>
+ <artifactId>activemq-ra</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5-console-jetty</artifactId>
+ <artifactId>activemq-console-jetty</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
@@ -69,16 +69,16 @@
<configuration>
<!--<assemblies>-->
<!--<assembly>-->
- <!--<id>activemq5</id>-->
+ <!--<id>activemq</id>-->
<!--<groupId>org.apache.geronimo.plugins</groupId>-->
- <!--<artifactId>activemq5-server</artifactId>-->
+ <!--<artifactId>activemq-server</artifactId>-->
<!--<version>${geronimoVersion}</version>-->
<!--<classifier>bin</classifier>-->
<!--<type>zip</type>-->
<!--</assembly>-->
<!--</assemblies>-->
- <!--<defaultAssemblyId>activemq5</defaultAssemblyId>-->
+ <!--<defaultAssemblyId>activemq</defaultAssemblyId>-->
<assemblyArchive>${project.build.directory}/${pom.artifactId}-${pom.version}-bin.zip</assemblyArchive>
<optionSets>
<optionSet>
@@ -214,4 +214,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-management/pom.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-management/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-management/pom.xml Tue Dec 9 07:38:24 2008
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5</artifactId>
+ <artifactId>activemq</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq5-management</artifactId>
- <name>Geronimo Plugins, ActiveMQ5 :: Management Interfaces</name>
+ <artifactId>geronimo-activemq-management</artifactId>
+ <name>Geronimo Plugins, ActiveMQ v5 :: Management Interfaces</name>
<dependencies>
<dependency>
Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml Tue Dec 9 07:38:24 2008
@@ -24,17 +24,17 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5</artifactId>
+ <artifactId>activemq</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq5-ra</artifactId>
- <name>Geronimo Plugins, ActiveMQ5 :: Resource Adapter Core</name>
+ <artifactId>geronimo-activemq-ra</artifactId>
+ <name>Geronimo Plugins, ActiveMQ v5 :: Resource Adapter Core</name>
<packaging>rar</packaging>
<description>
- Resource Adapter for using ActiveMQ5 in Geronimo.
+ Resource Adapter for using ActiveMQ v5 in Geronimo.
</description>
<!--
Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml Tue Dec 9 07:38:24 2008
@@ -24,18 +24,18 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq5</artifactId>
+ <artifactId>activemq</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq5</artifactId>
- <name>Geronimo Plugins, ActiveMQ5 :: Core</name>
+ <artifactId>geronimo-activemq</artifactId>
+ <name>Geronimo Plugins, ActiveMQ v5 :: Core</name>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq5-management</artifactId>
+ <artifactId>geronimo-activemq-management</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Tue Dec 9 07:38:24 2008
@@ -28,24 +28,24 @@
<version>2.2-SNAPSHOT</version>
</parent>
- <artifactId>activemq5</artifactId>
- <name>Geronimo Plugins, ActiveMQ 5</name>
+ <artifactId>activemq</artifactId>
+ <name>Geronimo Plugins, ActiveMQ v5</name>
<packaging>pom</packaging>
<description>
- ActiveMQ 5 plugin
+ ActiveMQ v5 plugin
</description>
<modules>
- <module>activemq5-broker</module>
- <module>geronimo-activemq5-ra</module>
- <module>activemq5-ra</module>
- <module>geronimo-activemq5</module>
- <module>geronimo-activemq5-management</module>
- <module>activemq5-portlets</module>
- <module>activemq5-console-jetty</module>
- <module>activemq5-console-tomcat</module>
- <module>activemq5-server</module>
+ <module>activemq-broker</module>
+ <module>geronimo-activemq-ra</module>
+ <module>activemq-ra</module>
+ <module>geronimo-activemq</module>
+ <module>geronimo-activemq-management</module>
+ <module>activemq-portlets</module>
+ <module>activemq-console-jetty</module>
+ <module>activemq-console-tomcat</module>
+ <module>activemq-server</module>
</modules>
<dependencyManagement>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
+ <version>${activemqVersion}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -69,19 +69,19 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
- <version>5.2.0</version>
+ <version>${activemqVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-rar</artifactId>
<type>rar</type>
- <version>5.2.0</version>
+ <version>${activemqVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activeio-core</artifactId>
- <version>3.1.0</version>
+ <version>${activeioVersion}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -90,8 +90,7 @@
</exclusions>
</dependency>
-
</dependencies>
</dependencyManagement>
-</project>
\ No newline at end of file
+</project>
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/jms-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/jms-plan.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/jms-plan.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/jms-plan.xml Tue Dec 9 07:38:24 2008
@@ -25,7 +25,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>${activemqString}-broker</artifactId>
+ <artifactId>activemq-broker</artifactId>
<type>car</type>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/jms-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/jms-plan.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/jms-plan.xml (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/jms-plan.xml Tue Dec 9 07:38:24 2008
@@ -25,7 +25,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>${activemqString}-broker</artifactId>
+ <artifactId>activemq-broker</artifactId>
<type>car</type>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/pom.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/pom.xml Tue Dec 9 07:38:24 2008
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>${activemqString}-broker</artifactId>
+ <artifactId>activemq-broker</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
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=724760&r1=724759&r2=724760&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 Tue Dec 9 07:38:24 2008
@@ -78,7 +78,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq5-broker</artifactId>
+ <artifactId>activemq-broker</artifactId>
<type>car</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Tue Dec 9 07:38:24 2008
@@ -51,7 +51,7 @@
</dependencies>
<modules>
- <module>activemq5</module>
+ <module>activemq</module>
<module>aspectj</module>
<module>axis</module>
<module>axis2</module>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Dec 9 07:38:24 2008
@@ -96,7 +96,10 @@
<!--<txmanagerVersion>2.2-SNAPSHOT</txmanagerVersion>-->
<monitoringConsoleVersion>2.2-SNAPSHOT</monitoringConsoleVersion>
- <activemqString>activemq5</activemqString>
+
+ <!-- The following are used by the Samples and Daytrader builds -->
+ <activemqVersion>5.2.0</activemqVersion>
+ <activeioVersion>3.1.0</activeioVersion>
<!-- Deployers -->
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${version}/car</gbeanDeployerBootstrap>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml Tue Dec 9 07:38:24 2008
@@ -32,7 +32,7 @@
<dep:dependencies>
<dep:dependency>
<dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>activemq5-broker</dep:artifactId>
+ <dep:artifactId>activemq-broker</dep:artifactId>
<dep:version>${version}</dep:version>
<dep:type>car</dep:type>
</dep:dependency>
@@ -67,7 +67,7 @@
<connector>TestJMS</connector>
<external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dep:groupId>org.apache.geronimo.modules</dep:groupId>
- <dep:artifactId>geronimo-activemq5-ra</dep:artifactId>
+ <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
<dep:type>rar</dep:type>
</external-path>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml?rev=724760&r1=724759&r2=724760&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml Tue Dec 9 07:38:24 2008
@@ -32,7 +32,7 @@
</dep:dependency>
<dep:dependency>
<dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>activemq5-ra</dep:artifactId>
+ <dep:artifactId>activemq-ra</dep:artifactId>
</dep:dependency>
</dep:dependencies>
</dep:environment>
@@ -84,4 +84,4 @@
</enterprise-beans>
</openejb-jar>
</module>
-</application>
\ No newline at end of file
+</application>