Index: applications/console-standard/project.xml
===================================================================
--- applications/console-standard/project.xml	(revision 388925)
+++ applications/console-standard/project.xml	(working copy)
@@ -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>              
Index: applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java
===================================================================
--- applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java	(revision 388925)
+++ applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java	(working copy)
@@ -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();
         }
Index: assemblies/minimal-tomcat-server/project.xml
===================================================================
--- assemblies/minimal-tomcat-server/project.xml	(revision 388925)
+++ assemblies/minimal-tomcat-server/project.xml	(working copy)
@@ -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>
Index: assemblies/j2ee-installer/project.xml
===================================================================
--- assemblies/j2ee-installer/project.xml	(revision 388925)
+++ assemblies/j2ee-installer/project.xml	(working copy)
@@ -672,7 +672,7 @@
         <!-- packages we include for others to use, mostly rars -->
         <dependency>
             <!-- included to make additional deployments easier -->
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-ra</artifactId>
             <version>${activemq_version}</version>
             <type>rar</type>
@@ -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>
Index: assemblies/j2ee-jetty-server/project.xml
===================================================================
--- assemblies/j2ee-jetty-server/project.xml	(revision 388925)
+++ assemblies/j2ee-jetty-server/project.xml	(working copy)
@@ -564,7 +564,7 @@
         <!-- packages we include for others to use, mostly rars -->
         <dependency>
             <!-- included to make additional deployments easier -->
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-ra</artifactId>
             <version>${activemq_version}</version>
             <type>rar</type>
@@ -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>
Index: assemblies/web-jms-tomcat-server/project.xml
===================================================================
--- assemblies/web-jms-tomcat-server/project.xml	(revision 388925)
+++ assemblies/web-jms-tomcat-server/project.xml	(working copy)
@@ -423,7 +423,7 @@
         <!-- packages we include for others to use, mostly rars -->
         <dependency>
             <!-- included to make additional deployments easier -->
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-ra</artifactId>
             <version>${activemq_version}</version>
             <type>rar</type>
@@ -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>
Index: assemblies/j2ee-tomcat-server/project.xml
===================================================================
--- assemblies/j2ee-tomcat-server/project.xml	(revision 388925)
+++ assemblies/j2ee-tomcat-server/project.xml	(working copy)
@@ -563,7 +563,7 @@
         <!-- packages we include for others to use, mostly rars -->
         <dependency>
             <!-- included to make additional deployments easier -->
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-ra</artifactId>
             <version>${activemq_version}</version>
             <type>rar</type>
@@ -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>
Index: configs/welcome-tomcat/project.xml
===================================================================
--- configs/welcome-tomcat/project.xml	(revision 388925)
+++ configs/welcome-tomcat/project.xml	(working copy)
@@ -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>
@@ -215,6 +215,7 @@
             <version>${activeio_version}</version>
         </dependency>
 
+
     </dependencies>
 </project>
 
Index: configs/client-security/project.xml
===================================================================
--- configs/client-security/project.xml	(revision 388925)
+++ configs/client-security/project.xml	(working copy)
@@ -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>
Index: configs/console-tomcat/project.xml
===================================================================
--- configs/console-tomcat/project.xml	(revision 388925)
+++ configs/console-tomcat/project.xml	(working copy)
@@ -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,7 +217,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <version>${activemq_version}</version>
             <properties>
@@ -225,6 +225,15 @@
             </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>
             <version>${geronimo_version}</version>
Index: configs/tomcat/project.xml
===================================================================
--- configs/tomcat/project.xml	(revision 388925)
+++ configs/tomcat/project.xml	(working copy)
@@ -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>
Index: configs/jmxdebug-tomcat/project.xml
===================================================================
--- configs/jmxdebug-tomcat/project.xml	(revision 388925)
+++ configs/jmxdebug-tomcat/project.xml	(working copy)
@@ -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>
Index: configs/activemq-broker/project.xml
===================================================================
--- configs/activemq-broker/project.xml	(revision 388925)
+++ configs/activemq-broker/project.xml	(working copy)
@@ -189,7 +189,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 +197,7 @@
              </properties>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean</artifactId>
             <version>${activemq_version}</version>
             <properties>
@@ -205,7 +205,7 @@
              </properties>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
             <properties>
@@ -213,9 +213,9 @@
              </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>
Index: configs/jsp-examples-tomcat/project.xml
===================================================================
--- configs/jsp-examples-tomcat/project.xml	(revision 388925)
+++ configs/jsp-examples-tomcat/project.xml	(working copy)
@@ -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>
Index: configs/console-jetty/project.xml
===================================================================
--- configs/console-jetty/project.xml	(revision 388925)
+++ configs/console-jetty/project.xml	(working copy)
@@ -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,14 +218,24 @@
             </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>
             <version>${geronimo_version}</version>
Index: configs/daytrader-tomcat/project.xml
===================================================================
--- configs/daytrader-tomcat/project.xml	(revision 388925)
+++ configs/daytrader-tomcat/project.xml	(working copy)
@@ -107,7 +107,7 @@
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-ra</artifactId>
             <version>${activemq_version}</version>
             <type>rar</type>
Index: configs/directory/project.xml
===================================================================
--- configs/directory/project.xml	(revision 388925)
+++ configs/directory/project.xml	(working copy)
@@ -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>
Index: configs/jsp-examples-jetty/project.xml
===================================================================
--- configs/jsp-examples-jetty/project.xml	(revision 388925)
+++ configs/jsp-examples-jetty/project.xml	(working copy)
@@ -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>
Index: configs/tomcat-deployer/project.xml
===================================================================
--- configs/tomcat-deployer/project.xml	(revision 388925)
+++ configs/tomcat-deployer/project.xml	(working copy)
@@ -196,15 +196,16 @@
             <artifactId>asm</artifactId>
             <version>${asm_version}</version>
         </dependency>
+
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>
         <dependency>
-            <groupId>activeio</groupId>
-            <artifactId>activeio</artifactId>
-            <version>${activeio_version}</version>
+            <groupId>incubator-activemq</groupId>
+            <artifactId>activeioc-ore</artifactId>
+            <version>${activemq_activeio_version}</version>
         </dependency>
 
         <dependency>
Index: configs/activemq/project.xml
===================================================================
--- configs/activemq/project.xml	(revision 388925)
+++ configs/activemq/project.xml	(working copy)
@@ -80,20 +80,20 @@
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>
         <dependency>
-             <groupId>activemq</groupId>
+             <groupId>incubator-activemq</groupId>
              <artifactId>activemq-ra</artifactId>
              <version>${activemq_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>
 
     </dependencies>
Index: configs/hot-deployer/project.xml
===================================================================
--- configs/hot-deployer/project.xml	(revision 388925)
+++ configs/hot-deployer/project.xml	(working copy)
@@ -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>
Index: configs/jetty-deployer/project.xml
===================================================================
--- configs/jetty-deployer/project.xml	(revision 388925)
+++ configs/jetty-deployer/project.xml	(working copy)
@@ -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>
Index: configs/uddi-jetty/project.xml
===================================================================
--- configs/uddi-jetty/project.xml	(revision 388925)
+++ configs/uddi-jetty/project.xml	(working copy)
@@ -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>
Index: configs/system-database/project.xml
===================================================================
--- configs/system-database/project.xml	(revision 388925)
+++ configs/system-database/project.xml	(working copy)
@@ -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>
Index: configs/ldap-demo-tomcat/project.xml
===================================================================
--- configs/ldap-demo-tomcat/project.xml	(revision 388925)
+++ configs/ldap-demo-tomcat/project.xml	(working copy)
@@ -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>
Index: configs/welcome-jetty/project.xml
===================================================================
--- configs/welcome-jetty/project.xml	(revision 388925)
+++ configs/welcome-jetty/project.xml	(working copy)
@@ -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>
Index: configs/j2ee-security/project.xml
===================================================================
--- configs/j2ee-security/project.xml	(revision 388925)
+++ configs/j2ee-security/project.xml	(working copy)
@@ -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>
Index: configs/rmi-naming/project.xml
===================================================================
--- configs/rmi-naming/project.xml	(revision 388925)
+++ configs/rmi-naming/project.xml	(working copy)
@@ -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>
Index: configs/ldap-demo-jetty/project.xml
===================================================================
--- configs/ldap-demo-jetty/project.xml	(revision 388925)
+++ configs/ldap-demo-jetty/project.xml	(working copy)
@@ -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>
Index: configs/client-corba/project.xml
===================================================================
--- configs/client-corba/project.xml	(revision 388925)
+++ configs/client-corba/project.xml	(working copy)
@@ -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>
Index: configs/servlets-examples-tomcat/project.xml
===================================================================
--- configs/servlets-examples-tomcat/project.xml	(revision 388925)
+++ configs/servlets-examples-tomcat/project.xml	(working copy)
@@ -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>
Index: configs/j2ee-corba/project.xml
===================================================================
--- configs/j2ee-corba/project.xml	(revision 388925)
+++ configs/j2ee-corba/project.xml	(working copy)
@@ -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>
Index: configs/uddi-tomcat/project.xml
===================================================================
--- configs/uddi-tomcat/project.xml	(revision 388925)
+++ configs/uddi-tomcat/project.xml	(working copy)
@@ -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>
Index: configs/daytrader-jetty/project.xml
===================================================================
--- configs/daytrader-jetty/project.xml	(revision 388925)
+++ configs/daytrader-jetty/project.xml	(working copy)
@@ -106,7 +106,7 @@
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-ra</artifactId>
             <version>${activemq_version}</version>
             <type>rar</type>
Index: configs/ldap-realm/project.xml
===================================================================
--- configs/ldap-realm/project.xml	(revision 388925)
+++ configs/ldap-realm/project.xml	(working copy)
@@ -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>
Index: configs/client/project.xml
===================================================================
--- configs/client/project.xml	(revision 388925)
+++ configs/client/project.xml	(working copy)
@@ -247,7 +247,7 @@
              </properties>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
+            <groupId>incubator-activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
             <version>${activemq_version}</version>
         </dependency>
Index: modules/activemq-embedded-rar/project.xml
===================================================================
--- modules/activemq-embedded-rar/project.xml	(revision 388925)
+++ modules/activemq-embedded-rar/project.xml	(working copy)
@@ -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>
Index: etc/project.properties
===================================================================
--- etc/project.properties	(revision 388925)
+++ etc/project.properties	(working copy)
@@ -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