geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r701669 - in /geronimo/server/trunk/plugins/activemq5: activemq-broker/ activemq-console-jetty/ activemq-console-tomcat/ activemq-portlets/ activemq-ra/ activemq5-broker/ activemq5-broker/src/ activemq5-broker/src/main/history/ activemq5-co...
Date Sat, 04 Oct 2008 17:01:41 GMT
Author: djencks
Date: Sat Oct  4 10:01:40 2008
New Revision: 701669

URL: http://svn.apache.org/viewvc?rev=701669&view=rev
Log:
GERONIMO-4337 make the build work -- still used amq4

Added:
    geronimo/server/trunk/plugins/activemq5/activemq5-broker/
      - copied from r701659, geronimo/server/trunk/plugins/activemq5/activemq-broker/
    geronimo/server/trunk/plugins/activemq5/activemq5-broker/pom.xml
      - copied unchanged from r701668, geronimo/server/trunk/plugins/activemq5/activemq-broker/pom.xml
    geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/
      - copied from r701668, geronimo/server/trunk/plugins/activemq5/activemq-broker/src/
    geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/
      - copied from r701659, geronimo/server/trunk/plugins/activemq5/activemq-console-jetty/
    geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/pom.xml
      - copied, changed from r701668, geronimo/server/trunk/plugins/activemq5/activemq-console-jetty/pom.xml
    geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/src/
      - copied from r701668, geronimo/server/trunk/plugins/activemq5/activemq-console-jetty/src/
    geronimo/server/trunk/plugins/activemq5/activemq5-console-tomcat/
      - copied from r701659, geronimo/server/trunk/plugins/activemq5/activemq-console-tomcat/
    geronimo/server/trunk/plugins/activemq5/activemq5-console-tomcat/pom.xml
      - copied, changed from r701668, geronimo/server/trunk/plugins/activemq5/activemq-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/activemq5/activemq5-console-tomcat/src/
      - copied from r701668, geronimo/server/trunk/plugins/activemq5/activemq-console-tomcat/src/
    geronimo/server/trunk/plugins/activemq5/activemq5-portlets/
      - copied from r701659, geronimo/server/trunk/plugins/activemq5/activemq-portlets/
    geronimo/server/trunk/plugins/activemq5/activemq5-portlets/pom.xml
      - copied unchanged from r701668, geronimo/server/trunk/plugins/activemq5/activemq-portlets/pom.xml
    geronimo/server/trunk/plugins/activemq5/activemq5-portlets/src/
      - copied from r701668, geronimo/server/trunk/plugins/activemq5/activemq-portlets/src/
    geronimo/server/trunk/plugins/activemq5/activemq5-ra/
      - copied from r701659, geronimo/server/trunk/plugins/activemq5/activemq-ra/
    geronimo/server/trunk/plugins/activemq5/activemq5-ra/pom.xml
      - copied unchanged from r701668, geronimo/server/trunk/plugins/activemq5/activemq-ra/pom.xml
    geronimo/server/trunk/plugins/activemq5/activemq5-ra/src/
      - copied from r701668, geronimo/server/trunk/plugins/activemq5/activemq-ra/src/
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/
      - copied from r701659, geronimo/server/trunk/plugins/activemq5/geronimo-activemq/
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq5-management/
      - copied from r701659, geronimo/server/trunk/plugins/activemq5/geronimo-activemq-management/
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq5-management/pom.xml
      - copied unchanged from r701668, geronimo/server/trunk/plugins/activemq5/geronimo-activemq-management/pom.xml
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq5-management/src/
      - copied from r701668, geronimo/server/trunk/plugins/activemq5/geronimo-activemq-management/src/
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq5-ra/
      - copied from r701659, geronimo/server/trunk/plugins/activemq5/geronimo-activemq-ra/
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq5-ra/pom.xml
      - copied unchanged from r701668, geronimo/server/trunk/plugins/activemq5/geronimo-activemq-ra/pom.xml
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq5-ra/src/
      - copied from r701668, geronimo/server/trunk/plugins/activemq5/geronimo-activemq-ra/src/
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/pom.xml
      - copied unchanged from r701668, geronimo/server/trunk/plugins/activemq5/geronimo-activemq/pom.xml
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/src/
      - copied from r701668, geronimo/server/trunk/plugins/activemq5/geronimo-activemq/src/
Removed:
    geronimo/server/trunk/plugins/activemq5/activemq-broker/
    geronimo/server/trunk/plugins/activemq5/activemq-console-jetty/
    geronimo/server/trunk/plugins/activemq5/activemq-console-tomcat/
    geronimo/server/trunk/plugins/activemq5/activemq-portlets/
    geronimo/server/trunk/plugins/activemq5/activemq-ra/
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq/
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq-management/
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq-ra/
Modified:
    geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq5/activemq5-console-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq5/activemq5-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/ManagementHelper.java
    geronimo/server/trunk/plugins/activemq5/activemq5-ra/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml?rev=701669&r1=701668&r2=701669&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml
Sat Oct  4 10:01:40 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>activemq-broker</artifactId>
+        <artifactId>activemq5-broker</artifactId>
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
@@ -13,12 +13,12 @@
     </dependency>
     <dependency>
         <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-core</artifactId>
+        <artifactId>activeio-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.activemq</groupId>
-        <artifactId>activeio-core</artifactId>
+        <artifactId>activemq-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -28,12 +28,12 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-activemq-management</artifactId>
+        <artifactId>geronimo-activemq5</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-activemq</artifactId>
+        <artifactId>geronimo-activemq5-management</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Copied: geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/pom.xml (from r701668,
geronimo/server/trunk/plugins/activemq5/activemq-console-jetty/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/pom.xml?p2=geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/pom.xml&p1=geronimo/server/trunk/plugins/activemq5/activemq-console-jetty/pom.xml&r1=701668&r2=701669&rev=701669&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/pom.xml Sat Oct  4 10:01:40
2008
@@ -171,7 +171,7 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>activemq-portlets</artifactId>
+                        <artifactId>activemq5-portlets</artifactId>
                         <version>${version}</version>
                         <type>war</type>
                     </module>

Modified: geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/src/main/history/dependencies.xml?rev=701669&r1=701668&r2=701669&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/src/main/history/dependencies.xml
Sat Oct  4 10:01:40 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>activemq-console-jetty</artifactId>
+        <artifactId>activemq5-console-jetty</artifactId>
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
@@ -17,9 +17,9 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>activemq-ra</artifactId>
-        <type>car</type>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-activemq5-ra</artifactId>
+        <type>rar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
@@ -27,6 +27,11 @@
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>activemq5-ra</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>plugin</artifactId>
         <type>car</type>
@@ -38,11 +43,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-activemq-ra</artifactId>
-        <type>rar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-test-ddbean</artifactId>
         <type>jar</type>
     </dependency>

Copied: geronimo/server/trunk/plugins/activemq5/activemq5-console-tomcat/pom.xml (from r701668,
geronimo/server/trunk/plugins/activemq5/activemq-console-tomcat/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq5-console-tomcat/pom.xml?p2=geronimo/server/trunk/plugins/activemq5/activemq5-console-tomcat/pom.xml&p1=geronimo/server/trunk/plugins/activemq5/activemq-console-tomcat/pom.xml&r1=701668&r2=701669&rev=701669&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/activemq5-console-tomcat/pom.xml Sat Oct  4 10:01:40
2008
@@ -162,7 +162,7 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>activemq-portlets</artifactId>
+                        <artifactId>activemq5-portlets</artifactId>
                         <version>${version}</version>
                         <type>war</type>
                     </module>

Modified: geronimo/server/trunk/plugins/activemq5/activemq5-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq5-console-tomcat/src/main/history/dependencies.xml?rev=701669&r1=701668&r2=701669&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq5-console-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq5/activemq5-console-tomcat/src/main/history/dependencies.xml
Sat Oct  4 10:01:40 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>activemq-console-tomcat</artifactId>
+        <artifactId>activemq5-console-tomcat</artifactId>
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
@@ -12,13 +12,18 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-activemq5-ra</artifactId>
+        <type>rar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console-tomcat</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>activemq-ra</artifactId>
+        <artifactId>activemq5-ra</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -33,11 +38,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-activemq-ra</artifactId>
-        <type>rar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-test-ddbean</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/activemq5/activemq5-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/ManagementHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq5-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/ManagementHelper.java?rev=701669&r1=701668&r2=701669&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq5-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/ManagementHelper.java
(original)
+++ geronimo/server/trunk/plugins/activemq5/activemq5-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/ManagementHelper.java
Sat Oct  4 10:01:40 2008
@@ -31,7 +31,7 @@
 import org.apache.geronimo.kernel.Kernel;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class ManagementHelper {
     private final static String PLUGIN_HELPER_KEY = "org.apache.geronimo.console.activemq.ManagementHelper";

Modified: geronimo/server/trunk/plugins/activemq5/activemq5-ra/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq5-ra/src/main/history/dependencies.xml?rev=701669&r1=701668&r2=701669&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq5-ra/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq5/activemq5-ra/src/main/history/dependencies.xml
Sat Oct  4 10:01:40 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>activemq-ra</artifactId>
+        <artifactId>activemq5-ra</artifactId>
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>activemq-broker</artifactId>
+        <artifactId>activemq5-broker</artifactId>
         <type>car</type>
     </dependency>
 </plugin-artifact>



Mime
View raw message