geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r389341 - in /geronimo/trunk: applications/console-standard/ applications/console-standard/src/conf/ applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ applications/console-standard/src/java/org/apache...
Date Tue, 28 Mar 2006 01:08:44 GMT
Author: chirino
Date: Mon Mar 27 17:08:39 2006
New Revision: 389341

URL: http://svn.apache.org/viewcvs?rev=389341&view=rev
Log:
- Upgrading ActiveMQ from 3.2.1 to 4.0-SNAPSHOT.   On the next versioned release (RC2), we should switch to using that.
- One of DLQ console portlet will not work anymore :(
- A 3.2.1 copy of activemq-core is being brought in because OpenEJB is using WADI which still depends on 3.2.1


Modified:
    geronimo/trunk/applications/console-standard/project.xml
    geronimo/trunk/applications/console-standard/src/conf/jms-resource-providers.properties
    geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java
    geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java
    geronimo/trunk/applications/daytrader/bin/depresources.sh
    geronimo/trunk/applications/daytrader/dayTrader-plan.xml
    geronimo/trunk/applications/daytrader/project.properties
    geronimo/trunk/assemblies/j2ee-installer/project.xml
    geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
    geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
    geronimo/trunk/assemblies/minimal-tomcat-server/project.xml
    geronimo/trunk/assemblies/web-jms-tomcat-server/project.xml
    geronimo/trunk/configs/activemq-broker/project.xml
    geronimo/trunk/configs/activemq-broker/src/plan/plan.xml
    geronimo/trunk/configs/activemq/project.properties
    geronimo/trunk/configs/activemq/project.xml
    geronimo/trunk/configs/activemq/src/plan/plan.xml
    geronimo/trunk/configs/client-corba/project.xml
    geronimo/trunk/configs/client-security/project.xml
    geronimo/trunk/configs/client/project.xml
    geronimo/trunk/configs/console-jetty/project.xml
    geronimo/trunk/configs/console-tomcat/project.xml
    geronimo/trunk/configs/daytrader-jetty/project.xml
    geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml
    geronimo/trunk/configs/daytrader-tomcat/project.xml
    geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml
    geronimo/trunk/configs/directory/project.xml
    geronimo/trunk/configs/hot-deployer/project.xml
    geronimo/trunk/configs/j2ee-corba/project.xml
    geronimo/trunk/configs/j2ee-security/project.xml
    geronimo/trunk/configs/jetty-deployer/project.xml
    geronimo/trunk/configs/jetty/project.xml
    geronimo/trunk/configs/jmxdebug-jetty/project.xml
    geronimo/trunk/configs/jmxdebug-tomcat/project.xml
    geronimo/trunk/configs/jsp-examples-jetty/project.xml
    geronimo/trunk/configs/jsp-examples-tomcat/project.xml
    geronimo/trunk/configs/ldap-demo-jetty/project.xml
    geronimo/trunk/configs/ldap-demo-tomcat/project.xml
    geronimo/trunk/configs/ldap-realm/project.xml
    geronimo/trunk/configs/rmi-naming/project.xml
    geronimo/trunk/configs/servlets-examples-jetty/project.xml
    geronimo/trunk/configs/servlets-examples-tomcat/project.xml
    geronimo/trunk/configs/system-database/project.xml
    geronimo/trunk/configs/tomcat-deployer/project.xml
    geronimo/trunk/configs/tomcat/project.xml
    geronimo/trunk/configs/uddi-jetty/project.xml
    geronimo/trunk/configs/uddi-tomcat/project.xml
    geronimo/trunk/configs/welcome-jetty/project.xml
    geronimo/trunk/configs/welcome-tomcat/project.xml
    geronimo/trunk/etc/project.properties
    geronimo/trunk/modules/activemq-embedded-rar/pom.xml
    geronimo/trunk/modules/activemq-embedded-rar/project.xml
    geronimo/trunk/modules/activemq-embedded-rar/src/rar/META-INF/ra.xml

Modified: geronimo/trunk/applications/console-standard/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/project.xml (original)
+++ geronimo/trunk/applications/console-standard/project.xml Mon Mar 27 17:08:39 2006
@@ -208,7 +208,7 @@
             <version>${geronimo_spec_jms_version}</version>
         </dependency>  
          <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <version>${activemq_version}</version>
         </dependency>              

Modified: geronimo/trunk/applications/console-standard/src/conf/jms-resource-providers.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/conf/jms-resource-providers.properties?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/conf/jms-resource-providers.properties (original)
+++ geronimo/trunk/applications/console-standard/src/conf/jms-resource-providers.properties Mon Mar 27 17:08:39 2006
@@ -1,3 +1,3 @@
 provider.activemq.name=ActiveMQ
-provider.activemq.rar=activemq/activemq-ra/${activemq_version}/rar
+provider.activemq.rar=geronimo/geronimo-activemq-embedded-rar/${geronimo_version}/rar
 provider.activemq.dependency=geronimo/activemq-broker/${geronimo_version}/car

Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java Mon Mar 27 17:08:39 2006
@@ -48,7 +48,8 @@
 
     private static String MODULE_FILE;
 
-    private final static String ACTIVEMQ_RAR = "repository/activemq/rars/activemq-ra-3.2.1.rar";
+    //TODO: I feel so dirty updating this.
+    private final static String ACTIVEMQ_RAR = "repository/geronimo/rars/geronimo-activemq-embedded-rar-2.2-SNAPSHOT.rar";
 
     private static final String LINE_SEP = System.getProperty("line.separator");
 
@@ -197,4 +198,4 @@
 
         return dependencies;
     }
-}
\ No newline at end of file
+}

Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java Mon Mar 27 17:08:39 2006
@@ -34,7 +34,6 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import org.activemq.service.DeadLetterPolicy;
 import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
@@ -64,6 +63,7 @@
         String destinationName = request.getParameter("destinationName");
 
         try {
+            /*
             ObjectName adminObjectName = NameFactory.getComponentName(null,
                     null, destinationApplicationName, NameFactory.JCA_RESOURCE,
                     destinationModuleName, destinationName, null, baseContext);
@@ -101,7 +101,7 @@
             dlqBrowser = session.createBrowser((Queue) dlq);
 
             connection.start();
-
+             */
         } catch (Exception e) {
             e.printStackTrace();
         }

Modified: geronimo/trunk/applications/daytrader/bin/depresources.sh
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/bin/depresources.sh?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/bin/depresources.sh (original)
+++ geronimo/trunk/applications/daytrader/bin/depresources.sh Mon Mar 27 17:08:39 2006
@@ -4,6 +4,6 @@
 
 java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager deploy ${GERONIMO_HOME}/repository/tranql/rars/tranql-connector-1.2-SNAPSHOT.rar mydb2-plan.xml
 
-java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager deploy ${GERONIMO_HOME}/repository/activemq/rars/activemq-ra-3.2-SNAPSHOT.rar jms-resource-plan.xml
+java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager deploy ${GERONIMO_HOME}/repository/geronimo/rars/geronimo-activemq-embedded-rar-2.2-SNAPSHOT.rar jms-resource-plan.xml
 
 java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager deploy dayTrader.ear dayTrader-plan-fixed.xml

Modified: geronimo/trunk/applications/daytrader/dayTrader-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/dayTrader-plan.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/dayTrader-plan.xml (original)
+++ geronimo/trunk/applications/daytrader/dayTrader-plan.xml Mon Mar 27 17:08:39 2006
@@ -518,7 +518,7 @@
             configId="foo"
             clientConfigId="tradeStreamerAppclient">
             <resource>
-                <!-- $MRH --> <external-rar>activemq/activemq-ra/3.2.1/rar</external-rar>
+                <!-- $MRH --> <external-rar>geronimo/geronimo-activemq-embedded-rar/2.2-SNAPSHOT/rar</external-rar>
                 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
            configId="org/apache/geronimo/SystemJMS"
            parentId="org/apache/geronimo/ActiveMQServer">
@@ -617,7 +617,7 @@
 
     <ext-module>
         <connector>TradeJMS</connector>
-        <!-- $MRH --> <external-path>activemq/activemq-ra/3.2.1/rar</external-path>
+        <!-- $MRH --> <external-path>geronimo/geronimo-activemq-embedded-rar/2.2-SNAPSHOT/rar</external-path>
         <connector
             xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
             xmlns:naming="http://geronimo.apache.org/xml/ns/naming"

Modified: geronimo/trunk/applications/daytrader/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/project.properties?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/project.properties (original)
+++ geronimo/trunk/applications/daytrader/project.properties Mon Mar 27 17:08:39 2006
@@ -5,7 +5,3 @@
 maven.multiproject.ear.includes=ear/project.xml
 maven.multiproject.streamer.includes=streamer/project.xml
 maven.multiproject.jar.includes=core/project.xml,wsappclient/project.xml
-
-#geronimo_version=1.2-SNAPSHOT
-#activemq_version=3.2.1
-

Modified: geronimo/trunk/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/project.xml Mon Mar 27 17:08:39 2006
@@ -672,9 +672,9 @@
         <!-- packages we include for others to use, mostly rars -->
         <dependency>
             <!-- included to make additional deployments easier -->
-            <groupId>activemq</groupId>
-            <artifactId>activemq-ra</artifactId>
-            <version>${activemq_version}</version>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-activemq-embedded-rar</artifactId>
+            <version>${geronimo_version}</version>
             <type>rar</type>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
@@ -890,19 +890,19 @@
 
         <!-- Dependencies that should be resolved by transitive dependencies and are loaded by the assembly plugin into the repository -->
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <version>${activemq_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean</artifactId>
             <version>${activemq_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Mon Mar 27 17:08:39 2006
@@ -564,9 +564,9 @@
         <!-- packages we include for others to use, mostly rars -->
         <dependency>
             <!-- included to make additional deployments easier -->
-            <groupId>activemq</groupId>
-            <artifactId>activemq-ra</artifactId>
-            <version>${activemq_version}</version>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-activemq-embedded-rar</artifactId>
+            <version>${geronimo_version}</version>
             <type>rar</type>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
@@ -782,19 +782,19 @@
 
         <!-- Dependencies that should be resolved by transitive dependencies and are loaded by the assembly plugin into the repository -->
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <version>${activemq_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean</artifactId>
             <version>${activemq_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Mon Mar 27 17:08:39 2006
@@ -563,9 +563,9 @@
         <!-- packages we include for others to use, mostly rars -->
         <dependency>
             <!-- included to make additional deployments easier -->
-            <groupId>activemq</groupId>
-            <artifactId>activemq-ra</artifactId>
-            <version>${activemq_version}</version>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-activemq-embedded-rar</artifactId>
+            <version>${geronimo_version}</version>
             <type>rar</type>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
@@ -781,19 +781,19 @@
 
         <!-- Dependencies that should be resolved by transitive dependencies and are loaded by the assembly plugin into the repository -->
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <version>${activemq_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean</artifactId>
             <version>${activemq_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/assemblies/minimal-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/minimal-tomcat-server/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/assemblies/minimal-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/minimal-tomcat-server/project.xml Mon Mar 27 17:08:39 2006
@@ -383,19 +383,19 @@
 
         <!-- Dependencies that should be resolved by transitive dependencies and are loaded by the assembly plugin into the repository -->
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <version>${activemq_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean</artifactId>
             <version>${activemq_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/assemblies/web-jms-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/web-jms-tomcat-server/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/assemblies/web-jms-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/web-jms-tomcat-server/project.xml Mon Mar 27 17:08:39 2006
@@ -423,9 +423,9 @@
         <!-- packages we include for others to use, mostly rars -->
         <dependency>
             <!-- included to make additional deployments easier -->
-            <groupId>activemq</groupId>
-            <artifactId>activemq-ra</artifactId>
-            <version>${activemq_version}</version>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-activemq-embedded-rar</artifactId>
+            <version>${geronimo_version}</version>
             <type>rar</type>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
@@ -573,19 +573,19 @@
 
         <!-- Dependencies that should be resolved by transitive dependencies and are loaded by the assembly plugin into the repository -->
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <version>${activemq_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean</artifactId>
             <version>${activemq_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/activemq-broker/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/activemq-broker/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq-broker/project.xml (original)
+++ geronimo/trunk/configs/activemq-broker/project.xml Mon Mar 27 17:08:39 2006
@@ -142,12 +142,6 @@
             <artifactId>geronimo-jetty</artifactId>
             <version>${geronimo_version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-            <version>${concurrent_version}</version>
-        </dependency>
         <dependency>
             <groupId>tranql</groupId>
             <artifactId>tranql</artifactId>
@@ -189,7 +183,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <version>${activemq_version}</version>
             <properties>
@@ -197,7 +191,7 @@
              </properties>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean</artifactId>
             <version>${activemq_version}</version>
             <properties>
@@ -205,7 +199,7 @@
              </properties>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
             <properties>
@@ -213,9 +207,17 @@
              </properties>
         </dependency>
         <dependency>
-            <groupId>activeio</groupId>
-            <artifactId>activeio</artifactId>
-            <version>${activeio_version}</version>
+            <groupId>incubator-activemq</groupId>
+            <artifactId>activeio-core</artifactId>
+            <version>${activemq_activeio_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>${backport_util_concurrent_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>

Modified: geronimo/trunk/configs/activemq-broker/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/activemq-broker/src/plan/plan.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq-broker/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/activemq-broker/src/plan/plan.xml Mon Mar 27 17:08:39 2006
@@ -24,52 +24,26 @@
                configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
-
     <!-- management -->
-    <gbean name="ActiveMQ" class="org.activemq.gbean.management.ActiveMQManagerGBean" />
+    <gbean name="ActiveMQ" class="org.apache.activemq.gbean.management.ActiveMQManagerGBean" />
 
     <!-- message broker -->
-    <gbean name="ActiveMQ" class="org.activemq.gbean.ActiveMQContainerGBean">
+    <gbean name="ActiveMQ" class="org.apache.activemq.gbean.BrokerServiceGBeanImpl">
         <attribute name="brokerName">possibly-unique-broker</attribute>
-        <reference name="persistenceAdapter"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.cache,*</gbean-name></reference>
-<!--        <reference name="ConnectorCollection"><gbean-name>geronimo.server:j2eeType=JMSConnector,broker=ActiveMQ,*</gbean-name></reference>-->
-    </gbean>
-
-    <gbean name="ActiveMQ.cache" class="org.activemq.store.cache.SimpleCachePersistenceAdapterGBean">
-        <attribute name="cacheSize">10000</attribute>
-        <reference name="longTermPersistence"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.journal,*</gbean-name></reference>
-    </gbean>
-
-    <gbean name="ActiveMQ.journal" class="org.activemq.store.journal.JournalPersistenceAdapterGBean">
-        <!--TODO change to ServerInfo -->
-        <reference name="serverInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><type>GBean</type><name>ServerInfo</name></reference>
-        <attribute name="directory">var/activemq/journal</attribute>
-        <attribute name="journalType">default</attribute>
-        <reference name="longTermPersistence"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.jdbc,*</gbean-name></reference>
     </gbean>
 
-    <gbean name="ActiveMQ.jdbc" class="org.activemq.store.jdbc.JDBCPersistenceAdapterGBean">
-        <reference name="dataSource"><gbean-name>geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo/system-database/${pom.currentVersion}/car,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource</gbean-name></reference>
-    </gbean>
-
-    <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.tcp.default" class="org.activemq.gbean.ActiveMQConnectorGBean">
+    <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.tcp.default" class="org.apache.activemq.gbean.TransportConnectorGBeanImpl">
         <attribute name="protocol">tcp</attribute>
         <attribute name="host">localhost</attribute>
         <attribute name="port">61616</attribute>
-        <reference name="activeMQContainer"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
+        <reference name="brokerService"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
     </gbean>
 
-    <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.vm.localhost" class="org.activemq.gbean.ActiveMQConnectorGBean">
+    <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.vm.localhost" class="org.apache.activemq.gbean.TransportConnectorGBeanImpl">
         <attribute name="protocol">vm</attribute>
         <attribute name="host">localhost</attribute>
         <attribute name="port">-1</attribute>
-        <reference name="activeMQContainer"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
-    </gbean>
-
-    <gbean name="SystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
-        <attribute name="systemProperties">
-            activemq.broker.disable-clean-shutdown=true
-        </attribute>
+        <reference name="brokerService"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
     </gbean>
 
 </configuration>

Modified: geronimo/trunk/configs/activemq/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/activemq/project.properties?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq/project.properties (original)
+++ geronimo/trunk/configs/activemq/project.properties Mon Mar 27 17:08:39 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.moduleFile=${maven.repo.local}/activemq/rars/activemq-ra-${activemq_version}.rar
+geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/rars/geronimo-activemq-embedded-rar-${geronimo_version}.rar
 
 geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 

Modified: geronimo/trunk/configs/activemq/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/activemq/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq/project.xml (original)
+++ geronimo/trunk/configs/activemq/project.xml Mon Mar 27 17:08:39 2006
@@ -22,7 +22,7 @@
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
     <id>activemq</id>
-    <name>Activemq configuration</name>
+    <name>ActiveMQ configuration</name>
 
     <dependencies>
         <!-- dependency on deployer -->
@@ -80,20 +80,25 @@
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>
         <dependency>
-             <groupId>activemq</groupId>
-             <artifactId>activemq-ra</artifactId>
-             <version>${activemq_version}</version>
+             <groupId>geronimo</groupId>
+             <artifactId>geronimo-activemq-embedded-rar</artifactId>
+             <version>${geronimo_version}</version>
              <type>rar</type>
          </dependency>
         <dependency>
-            <groupId>activeio</groupId>
-            <artifactId>activeio</artifactId>
-            <version>${activeio_version}</version>
+            <groupId>incubator-activemq</groupId>
+            <artifactId>activeio-core</artifactId>
+            <version>${activemq_activeio_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>${backport_util_concurrent_version}</version>
         </dependency>
 
     </dependencies>

Modified: geronimo/trunk/configs/activemq/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/activemq/src/plan/plan.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/activemq/src/plan/plan.xml Mon Mar 27 17:08:39 2006
@@ -54,7 +54,7 @@
     </resourceadapter>
     <adminobject>
         <adminobject-interface>javax.jms.Queue</adminobject-interface>
-        <adminobject-class>org.codehaus.activemq.message.ActiveMQQueue</adminobject-class>
+        <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
         <adminobject-instance>
             <message-destination-name>MDBTransferBeanOutQueue</message-destination-name>
             <config-property-setting name="PhysicalName">MDBTransferBeanOutQueue</config-property-setting>
@@ -62,7 +62,7 @@
     </adminobject>
     <adminobject>
         <adminobject-interface>javax.jms.Queue</adminobject-interface>
-        <adminobject-class>org.codehaus.activemq.message.ActiveMQQueue</adminobject-class>
+        <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
         <adminobject-instance>
             <message-destination-name>SendReceiveQueue</message-destination-name>
             <config-property-setting name="PhysicalName">SendReceiveQueue</config-property-setting>

Modified: geronimo/trunk/configs/client-corba/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client-corba/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/client-corba/project.xml (original)
+++ geronimo/trunk/configs/client-corba/project.xml Mon Mar 27 17:08:39 2006
@@ -189,7 +189,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/client-security/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client-security/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/client-security/project.xml (original)
+++ geronimo/trunk/configs/client-security/project.xml Mon Mar 27 17:08:39 2006
@@ -183,7 +183,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/client/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/client/project.xml (original)
+++ geronimo/trunk/configs/client/project.xml Mon Mar 27 17:08:39 2006
@@ -247,7 +247,7 @@
              </properties>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-jetty/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/project.xml (original)
+++ geronimo/trunk/configs/console-jetty/project.xml Mon Mar 27 17:08:39 2006
@@ -200,8 +200,9 @@
             <geronimo.dependency>true</geronimo.dependency>
         </properties>
     </dependency>
+
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
             <properties>
@@ -209,7 +210,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean</artifactId>
             <version>${activemq_version}</version>
             <properties>
@@ -217,13 +218,23 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <version>${activemq_version}</version>
             <properties>
                 <geronimo.dependency>true</geronimo.dependency>
             </properties>
         </dependency>
+
+        <dependency>
+            <groupId>incubator-activemq</groupId>
+            <artifactId>activeio-core</artifactId>
+            <version>${activemq_activeio_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
+
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-converter</artifactId>

Modified: geronimo/trunk/configs/console-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-tomcat/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/project.xml (original)
+++ geronimo/trunk/configs/console-tomcat/project.xml Mon Mar 27 17:08:39 2006
@@ -201,7 +201,7 @@
         </properties>
     </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
             <properties>
@@ -209,7 +209,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean</artifactId>
             <version>${activemq_version}</version>
             <properties>
@@ -217,13 +217,22 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <version>${activemq_version}</version>
             <properties>
                 <geronimo.dependency>true</geronimo.dependency>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>incubator-activemq</groupId>
+            <artifactId>activeio-core</artifactId>
+            <version>${activemq_activeio_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
+
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-converter</artifactId>

Modified: geronimo/trunk/configs/daytrader-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-jetty/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-jetty/project.xml (original)
+++ geronimo/trunk/configs/daytrader-jetty/project.xml Mon Mar 27 17:08:39 2006
@@ -106,9 +106,9 @@
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
-            <artifactId>activemq-ra</artifactId>
-            <version>${activemq_version}</version>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-activemq-embedded-rar</artifactId>
+            <version>${geronimo_version}</version>
             <type>rar</type>
         </dependency>
 

Modified: geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml Mon Mar 27 17:08:39 2006
@@ -510,7 +510,7 @@
             configId="foo"
             clientConfigId="${pom.groupId}/${pom.artifactId}-streamer-client/${daytrader_version}/car">
             <resource>
-                <external-rar>activemq/activemq-ra/${activemq_version}/rar</external-rar>
+                <external-rar>geronimo/geronimo-activemq-embedded-rar/${geronimo_version}/rar</external-rar>
                 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
            configId="org/apache/geronimo/SystemJMS"
            parentId="org/apache/geronimo/ActiveMQServer">
@@ -603,7 +603,7 @@
 
     <ext-module>
         <connector>TradeJMS</connector>
-        <external-path>activemq/activemq-ra/${activemq_version}/rar</external-path>
+        <external-path>geronimo/geronimo-activemq-embedded-rar/${geronimo_version}/rar</external-path>
         <connector
             xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
             xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.0"

Modified: geronimo/trunk/configs/daytrader-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-tomcat/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-tomcat/project.xml (original)
+++ geronimo/trunk/configs/daytrader-tomcat/project.xml Mon Mar 27 17:08:39 2006
@@ -107,9 +107,9 @@
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
-            <artifactId>activemq-ra</artifactId>
-            <version>${activemq_version}</version>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-activemq-embedded-rar</artifactId>
+            <version>${geronimo_version}</version>
             <type>rar</type>
         </dependency>
 

Modified: geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml Mon Mar 27 17:08:39 2006
@@ -510,7 +510,7 @@
             configId="foo"
             clientConfigId="${pom.groupId}/${pom.artifactId}-streamer-client/${daytrader_version}/car">
             <resource>
-                <external-rar>activemq/activemq-ra/${activemq_version}/rar</external-rar>
+                <external-rar>geronimo/geronimo-activemq-embedded-rar/${geronimo_version}/rar</external-rar>
                 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
            configId="org/apache/geronimo/SystemJMS"
            parentId="org/apache/geronimo/ActiveMQServer">
@@ -603,7 +603,7 @@
 
     <ext-module>
         <connector>TradeJMS</connector>
-        <external-path>activemq/activemq-ra/${activemq_version}/rar</external-path>
+        <external-path>geronimo/geronimo-activemq-embedded-rar/${geronimo_version}/rar</external-path>
         <connector
             xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
             xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.0"

Modified: geronimo/trunk/configs/directory/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/directory/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/directory/project.xml (original)
+++ geronimo/trunk/configs/directory/project.xml Mon Mar 27 17:08:39 2006
@@ -199,7 +199,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/hot-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/hot-deployer/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/hot-deployer/project.xml (original)
+++ geronimo/trunk/configs/hot-deployer/project.xml Mon Mar 27 17:08:39 2006
@@ -209,7 +209,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/j2ee-corba/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-corba/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-corba/project.xml (original)
+++ geronimo/trunk/configs/j2ee-corba/project.xml Mon Mar 27 17:08:39 2006
@@ -189,7 +189,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/j2ee-security/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-security/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-security/project.xml (original)
+++ geronimo/trunk/configs/j2ee-security/project.xml Mon Mar 27 17:08:39 2006
@@ -200,7 +200,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/jetty-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/project.xml (original)
+++ geronimo/trunk/configs/jetty-deployer/project.xml Mon Mar 27 17:08:39 2006
@@ -196,7 +196,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty/project.xml (original)
+++ geronimo/trunk/configs/jetty/project.xml Mon Mar 27 17:08:39 2006
@@ -195,7 +195,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/jmxdebug-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jmxdebug-jetty/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/jmxdebug-jetty/project.xml (original)
+++ geronimo/trunk/configs/jmxdebug-jetty/project.xml Mon Mar 27 17:08:39 2006
@@ -218,7 +218,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/jmxdebug-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jmxdebug-tomcat/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/jmxdebug-tomcat/project.xml (original)
+++ geronimo/trunk/configs/jmxdebug-tomcat/project.xml Mon Mar 27 17:08:39 2006
@@ -206,7 +206,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/jsp-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jsp-examples-jetty/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-jetty/project.xml (original)
+++ geronimo/trunk/configs/jsp-examples-jetty/project.xml Mon Mar 27 17:08:39 2006
@@ -218,7 +218,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/jsp-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jsp-examples-tomcat/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-tomcat/project.xml (original)
+++ geronimo/trunk/configs/jsp-examples-tomcat/project.xml Mon Mar 27 17:08:39 2006
@@ -206,7 +206,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/ldap-demo-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-demo-jetty/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-jetty/project.xml (original)
+++ geronimo/trunk/configs/ldap-demo-jetty/project.xml Mon Mar 27 17:08:39 2006
@@ -221,7 +221,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/ldap-demo-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-demo-tomcat/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-tomcat/project.xml (original)
+++ geronimo/trunk/configs/ldap-demo-tomcat/project.xml Mon Mar 27 17:08:39 2006
@@ -213,7 +213,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/ldap-realm/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-realm/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-realm/project.xml (original)
+++ geronimo/trunk/configs/ldap-realm/project.xml Mon Mar 27 17:08:39 2006
@@ -104,7 +104,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/rmi-naming/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/project.xml (original)
+++ geronimo/trunk/configs/rmi-naming/project.xml Mon Mar 27 17:08:39 2006
@@ -328,11 +328,10 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>
-    <!-- remote login -->
         <dependency>
             <groupId>activeio</groupId>
             <artifactId>activeio</artifactId>

Modified: geronimo/trunk/configs/servlets-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/servlets-examples-jetty/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-jetty/project.xml (original)
+++ geronimo/trunk/configs/servlets-examples-jetty/project.xml Mon Mar 27 17:08:39 2006
@@ -218,7 +218,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/servlets-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/servlets-examples-tomcat/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-tomcat/project.xml (original)
+++ geronimo/trunk/configs/servlets-examples-tomcat/project.xml Mon Mar 27 17:08:39 2006
@@ -206,7 +206,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>
@@ -215,6 +215,7 @@
             <artifactId>activeio</artifactId>
             <version>${activeio_version}</version>
         </dependency>
+
         <dependency>
             <groupId>geronimo-samples</groupId>
             <artifactId>geronimo-servlet-examples-tomcat</artifactId>

Modified: geronimo/trunk/configs/system-database/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/system-database/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/system-database/project.xml (original)
+++ geronimo/trunk/configs/system-database/project.xml Mon Mar 27 17:08:39 2006
@@ -244,7 +244,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/tomcat-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat-deployer/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/project.xml (original)
+++ geronimo/trunk/configs/tomcat-deployer/project.xml Mon Mar 27 17:08:39 2006
@@ -197,7 +197,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat/project.xml (original)
+++ geronimo/trunk/configs/tomcat/project.xml Mon Mar 27 17:08:39 2006
@@ -187,7 +187,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/uddi-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-jetty/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-jetty/project.xml (original)
+++ geronimo/trunk/configs/uddi-jetty/project.xml Mon Mar 27 17:08:39 2006
@@ -253,7 +253,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/uddi-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-tomcat/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-tomcat/project.xml (original)
+++ geronimo/trunk/configs/uddi-tomcat/project.xml Mon Mar 27 17:08:39 2006
@@ -255,7 +255,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/welcome-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-jetty/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/project.xml (original)
+++ geronimo/trunk/configs/welcome-jetty/project.xml Mon Mar 27 17:08:39 2006
@@ -218,7 +218,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>

Modified: geronimo/trunk/configs/welcome-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-tomcat/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-tomcat/project.xml (original)
+++ geronimo/trunk/configs/welcome-tomcat/project.xml Mon Mar 27 17:08:39 2006
@@ -205,7 +205,7 @@
             <version>${asm_version}</version>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>
@@ -214,6 +214,7 @@
             <artifactId>activeio</artifactId>
             <version>${activeio_version}</version>
         </dependency>
+
 
     </dependencies>
 </project>

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Mon Mar 27 17:08:39 2006
@@ -76,7 +76,8 @@
 # Dependency Versions
 #####################################################
 activeio_version=2.0-r118
-activemq_version=3.2.1
+activemq_activeio_version=3.0-SNAPSHOT
+activemq_version=4.0-SNAPSHOT
 geronimo_version=1.2-SNAPSHOT
 openejb_version=2.2-SNAPSHOT
 tranql_version=1.3-SNAPSHOT
@@ -174,7 +175,7 @@
 tomcat_version=5.5.15
 tomcat_servlet_examples_version=5.5.15
 tomcat_jsp_examples_version=5.5.15
-backport_util_concurrent_version=2.0_01_pd
+backport_util_concurrent_version=2.1
 wadi_version=2.0M1
 wadi_activecluster_version=1.2-20051115174934
 wadi_spring_version=1.2.5

Modified: geronimo/trunk/modules/activemq-embedded-rar/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/activemq-embedded-rar/pom.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-embedded-rar/pom.xml (original)
+++ geronimo/trunk/modules/activemq-embedded-rar/pom.xml Mon Mar 27 17:08:39 2006
@@ -45,12 +45,12 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>activemq</groupId>
+      <groupId>incubator-activemq</groupId>
       <artifactId>activemq-core</artifactId>
       <version>${activeMqVersion}</version>
     </dependency>
     <dependency>
-      <groupId>activemq</groupId>
+      <groupId>incubator-activemq</groupId>
       <artifactId>activemq-ra</artifactId>
       <version>${activeMqVersion}</version>
       <!--  Can't be found anywhere -->

Modified: geronimo/trunk/modules/activemq-embedded-rar/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/activemq-embedded-rar/project.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-embedded-rar/project.xml (original)
+++ geronimo/trunk/modules/activemq-embedded-rar/project.xml Mon Mar 27 17:08:39 2006
@@ -40,7 +40,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <version>${activemq_version}</version>
             <properties>
@@ -48,7 +48,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-ra</artifactId>
             <version>${activemq_version}</version>
             <properties>

Modified: geronimo/trunk/modules/activemq-embedded-rar/src/rar/META-INF/ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/activemq-embedded-rar/src/rar/META-INF/ra.xml?rev=389341&r1=389340&r2=389341&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-embedded-rar/src/rar/META-INF/ra.xml (original)
+++ geronimo/trunk/modules/activemq-embedded-rar/src/rar/META-INF/ra.xml Mon Mar 27 17:08:39 2006
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Hiram Chirino (Coredeveloper) -->
+<!--
+    Copyright 2005-2006 The Apache Software Foundation
+   
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
 <connector xmlns="http://java.sun.com/xml/ns/j2ee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
@@ -12,25 +27,26 @@
     <resourceadapter-version>1.0</resourceadapter-version>
     <license>
         <description>
-            Copyright 2004 Hiram Chirino
-            Copyright 2004 Protique Ltd
-
+        
+            Copyright 2005-2006 The Apache Software Foundation
+           
             Licensed under the Apache License, Version 2.0 (the "License");
             you may not use this file except in compliance with the License.
             You may obtain a copy of the License at
-
+           
             http://www.apache.org/licenses/LICENSE-2.0
-
+           
             Unless required by applicable law or agreed to in writing, software
             distributed under the License is distributed on an "AS IS" BASIS,
             WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
             See the License for the specific language governing permissions and
             limitations under the License.
+
         </description>
         <license-required>true</license-required>
     </license>
     <resourceadapter>
-        <resourceadapter-class>org.activemq.ra.ActiveMQResourceAdapter</resourceadapter-class>
+        <resourceadapter-class>org.apache.activemq.ra.ActiveMQResourceAdapter</resourceadapter-class>
         <config-property>
             <description>
               The URL to the ActiveMQ server that you want this connection to connect to.  If using
@@ -39,6 +55,7 @@
             <config-property-name>ServerUrl</config-property-name>
             <config-property-type>java.lang.String</config-property-type>
             <config-property-value>tcp://localhost:61616</config-property-value>
+<!--            <config-property-value>vm://localhost</config-property-value> -->
         </config-property>
         <config-property>
             <description>The default user name that will be used to establish connections to the ActiveMQ server.</description>
@@ -58,20 +75,16 @@
             <config-property-type>java.lang.String</config-property-type>
         </config-property>
         <config-property>
-            <description>Boolean to configure if the connector should create an embedded broker.</description>
-            <config-property-name>UseEmbeddedBroker</config-property-name>
-            <config-property-type>java.lang.Boolean</config-property-type>
-            <config-property-value>false</config-property-value>
-        </config-property>
-        <config-property>
             <description>Boolean to configure if outbound connections should reuse the inbound connection's session for sending messages.</description>
             <config-property-name>UseInboundSession</config-property-name>
             <config-property-type>java.lang.Boolean</config-property-type>
             <config-property-value>false</config-property-value>
         </config-property>
+
+        <!-- NOTE disable the following property if you do not wish to deploy an embedded broker -->
         <config-property>
             <description>
-              Sets the XML configuration file used to configure the ActiveMQ broker via 
+              Sets the XML configuration file used to configure the embedded ActiveMQ broker via 
               Spring if using embedded mode.
               
               BrokerXmlConfig is the filename which is assumed to be on the classpath unless 
@@ -81,29 +94,33 @@
             </description>
             <config-property-name>BrokerXmlConfig</config-property-name>
             <config-property-type>java.lang.String</config-property-type>
-            <config-property-value>broker-config.xml</config-property-value>
+            <config-property-value></config-property-value>
+            <!--
+            <config-property-value>xbean:broker-config.xml</config-property-value>
+            -->
         </config-property>
+
         <outbound-resourceadapter>
             <connection-definition>
-                <managedconnectionfactory-class>org.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
+                <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
                 <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
-                <connectionfactory-impl-class>org.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
+                <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
                 <connection-interface>javax.jms.Connection</connection-interface>
-                <connection-impl-class>org.activemq.ra.JMSConnectionProxy</connection-impl-class>
+                <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
             </connection-definition>
             <connection-definition>
-                <managedconnectionfactory-class>org.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
+                <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
                 <connectionfactory-interface>javax.jms.QueueConnectionFactory</connectionfactory-interface>
-                <connectionfactory-impl-class>org.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
+                <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
                 <connection-interface>javax.jms.QueueConnection</connection-interface>
-                <connection-impl-class>org.activemq.ra.JMSConnectionProxy</connection-impl-class>
+                <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
             </connection-definition>
             <connection-definition>
-                <managedconnectionfactory-class>org.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
+                <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
                 <connectionfactory-interface>javax.jms.TopicConnectionFactory</connectionfactory-interface>
-                <connectionfactory-impl-class>org.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
+                <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
                 <connection-interface>javax.jms.TopicConnection</connection-interface>
-                <connection-impl-class>org.activemq.ra.JMSConnectionProxy</connection-impl-class>
+                <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
             </connection-definition>
             <transaction-support>XATransaction</transaction-support>
             <authentication-mechanism>
@@ -117,7 +134,7 @@
                 <messagelistener>
                     <messagelistener-type>javax.jms.MessageListener</messagelistener-type>
                     <activationspec>
-                        <activationspec-class>org.activemq.ra.ActiveMQActivationSpec</activationspec-class>
+                        <activationspec-class>org.apache.activemq.ra.ActiveMQActivationSpec</activationspec-class>
                         
                         <required-config-property>
                             <config-property-name>destination</config-property-name>
@@ -132,7 +149,7 @@
         </inbound-resourceadapter>
         <adminobject>
             <adminobject-interface>javax.jms.Queue</adminobject-interface>
-            <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
+            <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
             <config-property>
                 <config-property-name>PhysicalName</config-property-name>
                 <config-property-type>java.lang.String</config-property-type>
@@ -140,7 +157,7 @@
         </adminobject>
         <adminobject>
             <adminobject-interface>javax.jms.Topic</adminobject-interface>
-            <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
+            <adminobject-class>org.apache.activemq.command.ActiveMQTopic</adminobject-class>
             <config-property>
                 <config-property-name>PhysicalName</config-property-name>
                 <config-property-type>java.lang.String</config-property-type>



Mime
View raw message