geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r701667 - in /geronimo/server/trunk/plugins/activemq5: ./ activemq-broker/ activemq-console-jetty/ activemq-console-tomcat/ activemq-portlets/ activemq-ra/ geronimo-activemq-management/ geronimo-activemq-ra/ geronimo-activemq/
Date Sat, 04 Oct 2008 16:45:47 GMT
Author: djencks
Date: Sat Oct  4 09:45:46 2008
New Revision: 701667

URL: http://svn.apache.org/viewvc?rev=701667&view=rev
Log:
GERONIMO-4337 first renaming step -- does not build yet

Modified:
    geronimo/server/trunk/plugins/activemq5/activemq-broker/pom.xml
    geronimo/server/trunk/plugins/activemq5/activemq-console-jetty/pom.xml
    geronimo/server/trunk/plugins/activemq5/activemq-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/activemq5/activemq-portlets/pom.xml
    geronimo/server/trunk/plugins/activemq5/activemq-ra/pom.xml
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq-management/pom.xml
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq-ra/pom.xml
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq/pom.xml
    geronimo/server/trunk/plugins/activemq5/pom.xml

Modified: geronimo/server/trunk/plugins/activemq5/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq-broker/pom.xml?rev=701667&r1=701666&r2=701667&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq-broker/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/activemq-broker/pom.xml Sat Oct  4 09:45:46 2008
@@ -24,16 +24,16 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>activemq</artifactId>
+        <artifactId>activemq5</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>activemq-broker</artifactId>
-    <name>Geronimo Plugins, ActiveMQ :: Broker</name>
+    <artifactId>activemq5-broker</artifactId>
+    <name>Geronimo Plugins, ActiveMQ5 :: Broker</name>
     <packaging>car</packaging>
 
-    <description>Apache ActiveMQ integration into geronimo.  This module starts an
activemq broker embedded in geronimo.</description>
+    <description>Apache ActiveMQ 5 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-activemq</artifactId>
+            <artifactId>geronimo-activemq5</artifactId>
             <version>${version}</version>
         </dependency>
        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-activemq-management</artifactId>
+            <artifactId>geronimo-activemq5-management</artifactId>
             <version>${version}</version>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/activemq5/activemq-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq-console-jetty/pom.xml?rev=701667&r1=701666&r2=701667&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/activemq-console-jetty/pom.xml Sat Oct  4 09:45:46
2008
@@ -24,18 +24,18 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>activemq</artifactId>
+        <artifactId>activemq5</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
-    <artifactId>activemq-console-jetty</artifactId>
-    <name>Geronimo Plugins, ActiveMQ :: Console (Jetty)</name>
+    <artifactId>activemq5-console-jetty</artifactId>
+    <name>Geronimo Plugins, ActiveMQ5 :: Console (Jetty)</name>
     <packaging>car</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>activemq-portlets</artifactId>
+            <artifactId>activemq5-portlets</artifactId>
             <version>${version}</version>
             <type>war</type>
             <scope>provided</scope>
@@ -56,7 +56,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq-ra</artifactId>
+            <artifactId>activemq5-ra</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -112,7 +112,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-activemq-ra</artifactId>
+            <artifactId>geronimo-activemq5-ra</artifactId>
             <version>${version}</version>
             <type>rar</type>
             <exclusions>

Modified: geronimo/server/trunk/plugins/activemq5/activemq-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq-console-tomcat/pom.xml?rev=701667&r1=701666&r2=701667&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/activemq-console-tomcat/pom.xml Sat Oct  4 09:45:46
2008
@@ -24,18 +24,18 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>activemq</artifactId>
+        <artifactId>activemq5</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
-    <artifactId>activemq-console-tomcat</artifactId>
-    <name>Geronimo Plugins, ActiveMQ :: Console (Tomcat)</name>
+    <artifactId>activemq5-console-tomcat</artifactId>
+    <name>Geronimo Plugins, ActiveMQ5 :: Console (Tomcat)</name>
     <packaging>car</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>activemq-portlets</artifactId>
+            <artifactId>activemq5-portlets</artifactId>
             <version>${version}</version>
             <type>war</type>
             <scope>provided</scope>
@@ -56,7 +56,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq-ra</artifactId>
+            <artifactId>activemq5-ra</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -112,7 +112,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-activemq-ra</artifactId>
+            <artifactId>geronimo-activemq5-ra</artifactId>
             <version>${version}</version>
             <type>rar</type>
             <exclusions>

Modified: geronimo/server/trunk/plugins/activemq5/activemq-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq-portlets/pom.xml?rev=701667&r1=701666&r2=701667&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/activemq-portlets/pom.xml Sat Oct  4 09:45:46
2008
@@ -24,12 +24,12 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>activemq</artifactId>
+        <artifactId>activemq5</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>activemq-portlets</artifactId>
-    <name>Geronimo Plugins, ActiveMQ :: Portlets</name>
+    <artifactId>activemq5-portlets</artifactId>
+    <name>Geronimo Plugins, ActiveMQ5 :: Portlets</name>
     <packaging>war</packaging>
 
     <dependencies>
@@ -105,7 +105,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-activemq</artifactId>
+            <artifactId>geronimo-activemq5</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/trunk/plugins/activemq5/activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq-ra/pom.xml?rev=701667&r1=701666&r2=701667&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq-ra/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/activemq-ra/pom.xml Sat Oct  4 09:45:46 2008
@@ -24,29 +24,29 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>activemq</artifactId>
+        <artifactId>activemq5</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>activemq-ra</artifactId>
-    <name>Geronimo Plugins, ActiveMQ :: Resource Adapter</name>
+    <artifactId>activemq5-ra</artifactId>
+    <name>Geronimo Plugins, ActiveMQ5 :: Resource Adapter</name>
     <packaging>car</packaging>
 
-    <description>Geronimo ActiveMQ integration: ActiveMQ resource adapter connecting
to (embedded) activemq broker.</description>
+    <description>Geronimo ActiveMQ5 integration: ActiveMQ5 resource adapter connecting
to (embedded) activemq broker.</description>
     
     <dependencies>
         <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq-broker</artifactId>
+            <artifactId>activemq5-broker</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-activemq-ra</artifactId>
+            <artifactId>geronimo-activemq5-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-activemq-ra</artifactId>
+                        <artifactId>geronimo-activemq5-ra</artifactId>
                         <version>${version}</version>
                         <type>rar</type>
                     </module>

Modified: geronimo/server/trunk/plugins/activemq5/geronimo-activemq-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/geronimo-activemq-management/pom.xml?rev=701667&r1=701666&r2=701667&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/geronimo-activemq-management/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/geronimo-activemq-management/pom.xml Sat Oct 
4 09:45:46 2008
@@ -24,13 +24,13 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>activemq</artifactId>
+        <artifactId>activemq5</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-activemq-management</artifactId>
-    <name>Geronimo Plugins, ActiveMQ :: Management Interfaces</name>
+    <artifactId>geronimo-activemq5-management</artifactId>
+    <name>Geronimo Plugins, ActiveMQ5 :: Management Interfaces</name>
     
     <dependencies>
         <dependency>

Modified: geronimo/server/trunk/plugins/activemq5/geronimo-activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/geronimo-activemq-ra/pom.xml?rev=701667&r1=701666&r2=701667&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/geronimo-activemq-ra/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/geronimo-activemq-ra/pom.xml Sat Oct  4 09:45:46
2008
@@ -24,17 +24,17 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>activemq</artifactId>
+        <artifactId>activemq5</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-activemq-ra</artifactId>
-    <name>Geronimo Plugins, ActiveMQ :: Resource Adapter Core</name>
+    <artifactId>geronimo-activemq5-ra</artifactId>
+    <name>Geronimo Plugins, ActiveMQ5 :: Resource Adapter Core</name>
     <packaging>rar</packaging>
     
     <description>
-        Resource Adapter for using ActiveMQ in Geronimo.
+        Resource Adapter for using ActiveMQ5 in Geronimo.
     </description>
     
     <!--

Modified: geronimo/server/trunk/plugins/activemq5/geronimo-activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/geronimo-activemq/pom.xml?rev=701667&r1=701666&r2=701667&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/geronimo-activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/geronimo-activemq/pom.xml Sat Oct  4 09:45:46
2008
@@ -24,18 +24,18 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>activemq</artifactId>
+        <artifactId>activemq5</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-activemq</artifactId>
-    <name>Geronimo Plugins, ActiveMQ :: Core</name>
+    <artifactId>geronimo-activemq5</artifactId>
+    <name>Geronimo Plugins, ActiveMQ5 :: Core</name>
     
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-activemq-management</artifactId>
+            <artifactId>geronimo-activemq5-management</artifactId>
             <version>${version}</version>
         </dependency>
  

Modified: geronimo/server/trunk/plugins/activemq5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/pom.xml?rev=701667&r1=701666&r2=701667&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/pom.xml Sat Oct  4 09:45:46 2008
@@ -28,23 +28,63 @@
         <version>2.2-SNAPSHOT</version>
     </parent>
     
-    <artifactId>activemq</artifactId>
-    <name>Geronimo Plugins, ActiveMQ</name>
+    <artifactId>activemq5</artifactId>
+    <name>Geronimo Plugins, ActiveMQ 5</name>
     <packaging>pom</packaging>
     
     <description>
-        ActiveMQ plugin
+        ActiveMQ 5 plugin
     </description>
 
     <modules>
-        <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>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>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>activemq-core</artifactId>
+                <version>4.1.2-G647819</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>activemq-ra</artifactId>
+                <version>4.1.2</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>activeio-core</artifactId>
+                <version>3.0.1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+
+        </dependencies>
+    </dependencyManagement>
+
 </project>



Mime
View raw message