activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [12/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-3 renaming package names from activemq6 to activemq
Date Mon, 17 Nov 2014 14:48:47 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/HornetQJBossBundle.java
----------------------------------------------------------------------
diff --git a/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/HornetQJBossBundle.java b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/HornetQJBossBundle.java
index 0df6e1c..a284759 100644
--- a/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/HornetQJBossBundle.java
+++ b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/HornetQJBossBundle.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.jboss;
+package org.apache.activemq.integration.jboss;
 
 
 import org.jboss.logging.annotations.MessageBundle;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/HornetQJBossLogger.java
----------------------------------------------------------------------
diff --git a/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/HornetQJBossLogger.java b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/HornetQJBossLogger.java
index 40beb1c..60fdcaa 100644
--- a/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/HornetQJBossLogger.java
+++ b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/HornetQJBossLogger.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.jboss;
+package org.apache.activemq.integration.jboss;
 
 import javax.security.auth.Subject;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/AS4SecurityActions.java
----------------------------------------------------------------------
diff --git a/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/AS4SecurityActions.java b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/AS4SecurityActions.java
index f1303e8..db0f269 100644
--- a/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/AS4SecurityActions.java
+++ b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/AS4SecurityActions.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.jboss.security;
+package org.apache.activemq.integration.jboss.security;
 
 import java.security.AccessController;
 import java.security.Principal;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/JBossASSecurityManager.java
----------------------------------------------------------------------
diff --git a/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/JBossASSecurityManager.java b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/JBossASSecurityManager.java
index c98579a..d56cf37 100644
--- a/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/JBossASSecurityManager.java
+++ b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/JBossASSecurityManager.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.jboss.security;
+package org.apache.activemq.integration.jboss.security;
 
 import java.security.AccessController;
 import java.security.Principal;
@@ -21,11 +21,11 @@ import java.util.Set;
 import javax.naming.InitialContext;
 import javax.security.auth.Subject;
 
-import org.apache.activemq6.core.security.CheckType;
-import org.apache.activemq6.core.security.Role;
-import org.apache.activemq6.core.server.HornetQComponent;
-import org.apache.activemq6.integration.jboss.HornetQJBossLogger;
-import org.apache.activemq6.spi.core.security.HornetQSecurityManager;
+import org.apache.activemq.core.security.CheckType;
+import org.apache.activemq.core.security.Role;
+import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.integration.jboss.HornetQJBossLogger;
+import org.apache.activemq.spi.core.security.HornetQSecurityManager;
 import org.jboss.security.AuthenticationManager;
 import org.jboss.security.RealmMapping;
 import org.jboss.security.SecurityContext;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/SecurityActions.java
----------------------------------------------------------------------
diff --git a/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/SecurityActions.java b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/SecurityActions.java
index 7c0fc3a..4a7af22 100644
--- a/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/SecurityActions.java
+++ b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/SecurityActions.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.jboss.security;
+package org.apache.activemq.integration.jboss.security;
 
 import java.security.AccessController;
 import java.security.Principal;
@@ -18,7 +18,7 @@ import java.security.PrivilegedAction;
 
 import javax.security.auth.Subject;
 
-import org.apache.activemq6.integration.jboss.HornetQJBossLogger;
+import org.apache.activemq.integration.jboss.HornetQJBossLogger;
 import org.jboss.security.SecurityContext;
 import org.jboss.security.SecurityContextAssociation;
 import org.jboss.security.SecurityContextFactory;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/tm/JBoss4TransactionManagerLocator.java
----------------------------------------------------------------------
diff --git a/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/tm/JBoss4TransactionManagerLocator.java b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/tm/JBoss4TransactionManagerLocator.java
index 99ba90e..581f8a4 100644
--- a/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/tm/JBoss4TransactionManagerLocator.java
+++ b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/tm/JBoss4TransactionManagerLocator.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.jboss.tm;
+package org.apache.activemq.integration.jboss.tm;
 
 import javax.transaction.TransactionManager;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/tm/JBoss5TransactionManagerLocator.java
----------------------------------------------------------------------
diff --git a/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/tm/JBoss5TransactionManagerLocator.java b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/tm/JBoss5TransactionManagerLocator.java
index 44074c5..81a2ed7 100644
--- a/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/tm/JBoss5TransactionManagerLocator.java
+++ b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/tm/JBoss5TransactionManagerLocator.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.jboss.tm;
+package org.apache.activemq.integration.jboss.tm;
 
 import javax.transaction.TransactionManager;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-spring-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml
index 6cb918e..c9df7c4 100644
--- a/integration/activemq-spring-integration/pom.xml
+++ b/integration/activemq-spring-integration/pom.xml
@@ -16,13 +16,13 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6</groupId>
-      <artifactId>activemq6-pom</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-pom</artifactId>
       <version>6.0.0-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
    </parent>
 
-   <artifactId>activemq6-spring-integration</artifactId>
+   <artifactId>activemq-spring-integration</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Spring Integration</name>
 
@@ -44,13 +44,13 @@
          <artifactId>jboss-logging</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-server</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-jms-server</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-jms-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringBindingRegistry.java
----------------------------------------------------------------------
diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringBindingRegistry.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringBindingRegistry.java
index 6e1de84..cb9ac50 100644
--- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringBindingRegistry.java
+++ b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringBindingRegistry.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.spring;
+package org.apache.activemq.integration.spring;
 
-import org.apache.activemq6.spi.core.naming.BindingRegistry;
+import org.apache.activemq.spi.core.naming.BindingRegistry;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringJmsBootstrap.java
----------------------------------------------------------------------
diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringJmsBootstrap.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringJmsBootstrap.java
index ced7d28..bf4885d 100644
--- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringJmsBootstrap.java
+++ b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringJmsBootstrap.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.spring;
+package org.apache.activemq.integration.spring;
 
-import org.apache.activemq6.jms.server.embedded.EmbeddedJMS;
+import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/HornetQSpringBundle.java
----------------------------------------------------------------------
diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/HornetQSpringBundle.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/HornetQSpringBundle.java
index eba1e74..76bf248 100644
--- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/HornetQSpringBundle.java
+++ b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/HornetQSpringBundle.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.spring;
+package org.apache.activemq.spring;
 
 
 import org.jboss.logging.annotations.MessageBundle;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/HornetQSpringLogger.java
----------------------------------------------------------------------
diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/HornetQSpringLogger.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/HornetQSpringLogger.java
index 404963a..d342c1d 100644
--- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/HornetQSpringLogger.java
+++ b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/HornetQSpringLogger.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.spring;
+package org.apache.activemq.spring;
 
 import org.jboss.logging.annotations.MessageLogger;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-twitter-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-twitter-integration/pom.xml b/integration/activemq-twitter-integration/pom.xml
index e76eb33..42720f0 100644
--- a/integration/activemq-twitter-integration/pom.xml
+++ b/integration/activemq-twitter-integration/pom.xml
@@ -3,13 +3,13 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6</groupId>
-      <artifactId>activemq6-pom</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-pom</artifactId>
       <version>6.0.0-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
    </parent>
 
-   <artifactId>activemq6-twitter-integration</artifactId>
+   <artifactId>activemq-twitter-integration</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Twitter Integration</name>
 
@@ -31,8 +31,8 @@
          <artifactId>jboss-logging</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-server</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterConstants.java
----------------------------------------------------------------------
diff --git a/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterConstants.java b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterConstants.java
index a0d22f1..e010e72 100644
--- a/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterConstants.java
+++ b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterConstants.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.twitter;
+package org.apache.activemq.integration.twitter;
 
 import java.util.HashSet;
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterIncomingConnectorServiceFactory.java
----------------------------------------------------------------------
diff --git a/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterIncomingConnectorServiceFactory.java b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterIncomingConnectorServiceFactory.java
index fbb72c0..c681a2b 100644
--- a/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterIncomingConnectorServiceFactory.java
+++ b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterIncomingConnectorServiceFactory.java
@@ -10,13 +10,13 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.twitter;
+package org.apache.activemq.integration.twitter;
 
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.postoffice.PostOffice;
-import org.apache.activemq6.core.server.ConnectorService;
-import org.apache.activemq6.core.server.ConnectorServiceFactory;
-import org.apache.activemq6.integration.twitter.impl.IncomingTweetsHandler;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.postoffice.PostOffice;
+import org.apache.activemq.core.server.ConnectorService;
+import org.apache.activemq.core.server.ConnectorServiceFactory;
+import org.apache.activemq.integration.twitter.impl.IncomingTweetsHandler;
 
 import java.util.Map;
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterOutgoingConnectorServiceFactory.java
----------------------------------------------------------------------
diff --git a/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterOutgoingConnectorServiceFactory.java b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterOutgoingConnectorServiceFactory.java
index c8557ee..1b24d76 100644
--- a/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterOutgoingConnectorServiceFactory.java
+++ b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterOutgoingConnectorServiceFactory.java
@@ -10,13 +10,13 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.twitter;
+package org.apache.activemq.integration.twitter;
 
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.postoffice.PostOffice;
-import org.apache.activemq6.core.server.ConnectorService;
-import org.apache.activemq6.core.server.ConnectorServiceFactory;
-import org.apache.activemq6.integration.twitter.impl.OutgoingTweetsHandler;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.postoffice.PostOffice;
+import org.apache.activemq.core.server.ConnectorService;
+import org.apache.activemq.core.server.ConnectorServiceFactory;
+import org.apache.activemq.integration.twitter.impl.OutgoingTweetsHandler;
 
 import java.util.Map;
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/impl/IncomingTweetsHandler.java
----------------------------------------------------------------------
diff --git a/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/impl/IncomingTweetsHandler.java b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/impl/IncomingTweetsHandler.java
index eca75ae..5f66a74 100644
--- a/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/impl/IncomingTweetsHandler.java
+++ b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/impl/IncomingTweetsHandler.java
@@ -10,23 +10,23 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.twitter.impl;
+package org.apache.activemq.integration.twitter.impl;
 
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.postoffice.Binding;
-import org.apache.activemq6.core.postoffice.PostOffice;
-import org.apache.activemq6.core.server.ConnectorService;
-import org.apache.activemq6.core.server.ServerMessage;
-import org.apache.activemq6.core.server.impl.ServerMessageImpl;
-import org.apache.activemq6.integration.twitter.TwitterConstants;
-import org.apache.activemq6.twitter.HornetQTwitterLogger;
-import org.apache.activemq6.utils.ConfigurationHelper;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.postoffice.Binding;
+import org.apache.activemq.core.postoffice.PostOffice;
+import org.apache.activemq.core.server.ConnectorService;
+import org.apache.activemq.core.server.ServerMessage;
+import org.apache.activemq.core.server.impl.ServerMessageImpl;
+import org.apache.activemq.integration.twitter.TwitterConstants;
+import org.apache.activemq.twitter.HornetQTwitterLogger;
+import org.apache.activemq.utils.ConfigurationHelper;
 import twitter4j.GeoLocation;
 import twitter4j.Paging;
 import twitter4j.Place;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/impl/OutgoingTweetsHandler.java
----------------------------------------------------------------------
diff --git a/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/impl/OutgoingTweetsHandler.java b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/impl/OutgoingTweetsHandler.java
index 3bdd255..1d8dc72 100644
--- a/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/impl/OutgoingTweetsHandler.java
+++ b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/impl/OutgoingTweetsHandler.java
@@ -10,26 +10,26 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.twitter.impl;
+package org.apache.activemq.integration.twitter.impl;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.filter.Filter;
-import org.apache.activemq6.core.postoffice.Binding;
-import org.apache.activemq6.core.postoffice.PostOffice;
-import org.apache.activemq6.core.server.ConnectorService;
-import org.apache.activemq6.core.server.Consumer;
-import org.apache.activemq6.core.server.HandleStatus;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.MessageReference;
-import org.apache.activemq6.core.server.Queue;
-import org.apache.activemq6.core.server.ServerMessage;
-import org.apache.activemq6.integration.twitter.TwitterConstants;
-import org.apache.activemq6.twitter.HornetQTwitterLogger;
-import org.apache.activemq6.utils.ConfigurationHelper;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.filter.Filter;
+import org.apache.activemq.core.postoffice.Binding;
+import org.apache.activemq.core.postoffice.PostOffice;
+import org.apache.activemq.core.server.ConnectorService;
+import org.apache.activemq.core.server.Consumer;
+import org.apache.activemq.core.server.HandleStatus;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.MessageReference;
+import org.apache.activemq.core.server.Queue;
+import org.apache.activemq.core.server.ServerMessage;
+import org.apache.activemq.integration.twitter.TwitterConstants;
+import org.apache.activemq.twitter.HornetQTwitterLogger;
+import org.apache.activemq.utils.ConfigurationHelper;
 import twitter4j.GeoLocation;
 import twitter4j.StatusUpdate;
 import twitter4j.Twitter;
@@ -162,7 +162,7 @@ public class OutgoingTweetsHandler implements Consumer, ConnectorService
    }
 
    /* (non-Javadoc)
-    * @see org.apache.activemq6.core.server.Consumer#getDeliveringMessages()
+    * @see org.apache.activemq.core.server.Consumer#getDeliveringMessages()
     */
    @Override
    public List<MessageReference> getDeliveringMessages()

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/twitter/HornetQTwitterBundle.java
----------------------------------------------------------------------
diff --git a/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/twitter/HornetQTwitterBundle.java b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/twitter/HornetQTwitterBundle.java
index bbfc2e4..6b2425d 100644
--- a/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/twitter/HornetQTwitterBundle.java
+++ b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/twitter/HornetQTwitterBundle.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.twitter;
+package org.apache.activemq.twitter;
 
 
 import org.jboss.logging.annotations.MessageBundle;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/twitter/HornetQTwitterLogger.java
----------------------------------------------------------------------
diff --git a/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/twitter/HornetQTwitterLogger.java b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/twitter/HornetQTwitterLogger.java
index f77cfe8..321f9b9 100644
--- a/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/twitter/HornetQTwitterLogger.java
+++ b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/twitter/HornetQTwitterLogger.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.twitter;
+package org.apache.activemq.twitter;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-vertx-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-vertx-integration/pom.xml b/integration/activemq-vertx-integration/pom.xml
index 8483e78..0624f96 100644
--- a/integration/activemq-vertx-integration/pom.xml
+++ b/integration/activemq-vertx-integration/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6</groupId>
-      <artifactId>activemq6-pom</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-pom</artifactId>
       <version>6.0.0-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
    </parent>
 
-   <artifactId>activemq6-vertx-integration</artifactId>
+   <artifactId>activemq-vertx-integration</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Vert.x Integration</name>
 
@@ -74,8 +74,8 @@
          <artifactId>jboss-logging</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-server</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-server</artifactId>
          <version>${project.version}</version>
       </dependency>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/HornetQVertxLogger.java
----------------------------------------------------------------------
diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/HornetQVertxLogger.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/HornetQVertxLogger.java
index 5172550..da40e8b 100644
--- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/HornetQVertxLogger.java
+++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/HornetQVertxLogger.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.vertx;
+package org.apache.activemq.integration.vertx;
 
-import org.apache.activemq6.core.server.ServerMessage;
+import org.apache.activemq.core.server.ServerMessage;
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.LogMessage;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/IncomingVertxEventHandler.java
----------------------------------------------------------------------
diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/IncomingVertxEventHandler.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/IncomingVertxEventHandler.java
index e2d7598..9f01cf4 100644
--- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/IncomingVertxEventHandler.java
+++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/IncomingVertxEventHandler.java
@@ -10,20 +10,20 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.vertx;
+package org.apache.activemq.integration.vertx;
 
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.postoffice.Binding;
-import org.apache.activemq6.core.postoffice.PostOffice;
-import org.apache.activemq6.core.server.ConnectorService;
-import org.apache.activemq6.core.server.ServerMessage;
-import org.apache.activemq6.core.server.impl.ServerMessageImpl;
-import org.apache.activemq6.utils.ConfigurationHelper;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.postoffice.Binding;
+import org.apache.activemq.core.postoffice.PostOffice;
+import org.apache.activemq.core.server.ConnectorService;
+import org.apache.activemq.core.server.ServerMessage;
+import org.apache.activemq.core.server.impl.ServerMessageImpl;
+import org.apache.activemq.utils.ConfigurationHelper;
 import org.vertx.java.core.Handler;
 import org.vertx.java.core.buffer.Buffer;
 import org.vertx.java.core.eventbus.EventBus;
@@ -80,7 +80,7 @@ public class IncomingVertxEventHandler implements ConnectorService
       this.haGroup = ConfigurationHelper.getStringProperty(VertxConstants.VERTX_HA_GROUP,
                "hornetq", configuration);
       this.vertxAddress = ConfigurationHelper.getStringProperty(VertxConstants.VERTX_ADDRESS,
-               "org.apache.activemq6", configuration);
+               "org.apache.activemq", configuration);
 
       this.storageManager = storageManager;
       this.postOffice = postOffice;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/OutgoingVertxEventHandler.java
----------------------------------------------------------------------
diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/OutgoingVertxEventHandler.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/OutgoingVertxEventHandler.java
index af96f30..4092b24 100644
--- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/OutgoingVertxEventHandler.java
+++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/OutgoingVertxEventHandler.java
@@ -10,25 +10,25 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.vertx;
+package org.apache.activemq.integration.vertx;
 
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.filter.Filter;
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.postoffice.Binding;
-import org.apache.activemq6.core.postoffice.PostOffice;
-import org.apache.activemq6.core.server.ConnectorService;
-import org.apache.activemq6.core.server.Consumer;
-import org.apache.activemq6.core.server.HandleStatus;
-import org.apache.activemq6.core.server.MessageReference;
-import org.apache.activemq6.core.server.Queue;
-import org.apache.activemq6.core.server.ServerMessage;
-import org.apache.activemq6.utils.ConfigurationHelper;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.filter.Filter;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.postoffice.Binding;
+import org.apache.activemq.core.postoffice.PostOffice;
+import org.apache.activemq.core.server.ConnectorService;
+import org.apache.activemq.core.server.Consumer;
+import org.apache.activemq.core.server.HandleStatus;
+import org.apache.activemq.core.server.MessageReference;
+import org.apache.activemq.core.server.Queue;
+import org.apache.activemq.core.server.ServerMessage;
+import org.apache.activemq.utils.ConfigurationHelper;
 import org.vertx.java.core.buffer.Buffer;
 import org.vertx.java.core.eventbus.EventBus;
 import org.vertx.java.core.eventbus.ReplyException;
@@ -86,7 +86,7 @@ public class OutgoingVertxEventHandler implements Consumer, ConnectorService
       this.haGroup = ConfigurationHelper.getStringProperty(VertxConstants.VERTX_HA_GROUP,
                "hornetq", configuration);
       this.vertxAddress = ConfigurationHelper.getStringProperty(VertxConstants.VERTX_ADDRESS,
-               "org.apache.activemq6", configuration);
+               "org.apache.activemq", configuration);
       this.publish = ConfigurationHelper.getBooleanProperty(VertxConstants.VERTX_PUBLISH, false,
                configuration);
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxConstants.java
----------------------------------------------------------------------
diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxConstants.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxConstants.java
index 7f5f022..b65cb76 100644
--- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxConstants.java
+++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxConstants.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.vertx;
+package org.apache.activemq.integration.vertx;
 
 import java.util.HashSet;
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxIncomingConnectorServiceFactory.java
----------------------------------------------------------------------
diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxIncomingConnectorServiceFactory.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxIncomingConnectorServiceFactory.java
index 3440de1..4c8ff04 100644
--- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxIncomingConnectorServiceFactory.java
+++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxIncomingConnectorServiceFactory.java
@@ -10,16 +10,16 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.vertx;
+package org.apache.activemq.integration.vertx;
 
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.postoffice.PostOffice;
-import org.apache.activemq6.core.server.ConnectorService;
-import org.apache.activemq6.core.server.ConnectorServiceFactory;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.postoffice.PostOffice;
+import org.apache.activemq.core.server.ConnectorService;
+import org.apache.activemq.core.server.ConnectorServiceFactory;
 
 public class VertxIncomingConnectorServiceFactory implements ConnectorServiceFactory
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxOutgoingConnectorServiceFactory.java
----------------------------------------------------------------------
diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxOutgoingConnectorServiceFactory.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxOutgoingConnectorServiceFactory.java
index 5265667..9829106 100644
--- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxOutgoingConnectorServiceFactory.java
+++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxOutgoingConnectorServiceFactory.java
@@ -10,16 +10,16 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.integration.vertx;
+package org.apache.activemq.integration.vertx;
 
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.postoffice.PostOffice;
-import org.apache.activemq6.core.server.ConnectorService;
-import org.apache.activemq6.core.server.ConnectorServiceFactory;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.postoffice.PostOffice;
+import org.apache.activemq.core.server.ConnectorService;
+import org.apache.activemq.core.server.ConnectorServiceFactory;
 
 public class VertxOutgoingConnectorServiceFactory implements ConnectorServiceFactory
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b548c99..014063b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.activemq6</groupId>
-   <artifactId>activemq6-pom</artifactId>
+   <groupId>org.apache.activemq</groupId>
+   <artifactId>activemq-pom</artifactId>
    <packaging>pom</packaging>
    <version>6.0.0-SNAPSHOT</version>
    <modules>
-      <module>activemq6-protocols</module>
-     <module>activemq6-dto</module>
+      <module>activemq-protocols</module>
+     <module>activemq-dto</module>
    </modules>
 
    <name>ActiveMQ6 Parent</name>
@@ -476,75 +476,75 @@
             <activeByDefault>true</activeByDefault>
          </activation>
          <modules>
-            <module>activemq6-dto</module>
-            <module>activemq6-bootstrap</module>
-            <module>activemq6-commons</module>
-            <module>activemq6-selector</module>
-            <module>activemq6-core-client</module>
-            <module>activemq6-server</module>
-            <module>activemq6-jms-client</module>
-            <module>activemq6-jms-server</module>
-            <module>activemq6-journal</module>
-            <module>activemq6-native</module>
-            <module>activemq6-ra</module>
-            <module>activemq6-rest</module>
-            <module>activemq6-service-sar</module>
-            <module>activemq6-tools</module>
-            <module>integration/activemq6-jboss-as-integration</module>
-            <module>integration/activemq6-spring-integration</module>
-            <module>integration/activemq6-twitter-integration</module>
-            <module>integration/activemq6-aerogear-integration</module>
-            <module>integration/activemq6-vertx-integration</module>
+            <module>activemq-dto</module>
+            <module>activemq-bootstrap</module>
+            <module>activemq-commons</module>
+            <module>activemq-selector</module>
+            <module>activemq-core-client</module>
+            <module>activemq-server</module>
+            <module>activemq-jms-client</module>
+            <module>activemq-jms-server</module>
+            <module>activemq-journal</module>
+            <module>activemq-native</module>
+            <module>activemq-ra</module>
+            <module>activemq-rest</module>
+            <module>activemq-service-sar</module>
+            <module>activemq-tools</module>
+            <module>integration/activemq-jboss-as-integration</module>
+            <module>integration/activemq-spring-integration</module>
+            <module>integration/activemq-twitter-integration</module>
+            <module>integration/activemq-aerogear-integration</module>
+            <module>integration/activemq-vertx-integration</module>
             <module>tests</module>
          </modules>
       </profile>
       <profile>
          <id>maven-release</id>
          <modules>
-            <module>activemq6-dto</module>
-            <module>activemq6-bootstrap</module>
-            <module>activemq6-commons</module>
-            <module>activemq6-selector</module>
-            <module>activemq6-core-client</module>
-            <module>activemq6-server</module>
-            <module>activemq6-jms-client</module>
-            <module>activemq6-jms-server</module>
-            <module>activemq6-journal</module>
-            <module>activemq6-native</module>
-            <module>activemq6-ra</module>
-            <module>activemq6-rest</module>
-            <module>activemq6-service-sar</module>
-            <module>activemq6-tools</module>
-            <module>integration/activemq6-jboss-as-integration</module>
-            <module>integration/activemq6-spring-integration</module>
-            <module>integration/activemq6-twitter-integration</module>
-            <module>integration/activemq6-aerogear-integration</module>
-            <module>integration/activemq6-vertx-integration</module>
+            <module>activemq-dto</module>
+            <module>activemq-bootstrap</module>
+            <module>activemq-commons</module>
+            <module>activemq-selector</module>
+            <module>activemq-core-client</module>
+            <module>activemq-server</module>
+            <module>activemq-jms-client</module>
+            <module>activemq-jms-server</module>
+            <module>activemq-journal</module>
+            <module>activemq-native</module>
+            <module>activemq-ra</module>
+            <module>activemq-rest</module>
+            <module>activemq-service-sar</module>
+            <module>activemq-tools</module>
+            <module>integration/activemq-jboss-as-integration</module>
+            <module>integration/activemq-spring-integration</module>
+            <module>integration/activemq-twitter-integration</module>
+            <module>integration/activemq-aerogear-integration</module>
+            <module>integration/activemq-vertx-integration</module>
             <module>examples</module>
          </modules>
       </profile>
       <profile>
          <id>release</id>
          <modules>
-            <module>activemq6-dto</module>
-            <module>activemq6-bootstrap</module>
-            <module>activemq6-commons</module>
-            <module>activemq6-selector</module>
-            <module>activemq6-core-client</module>
-            <module>activemq6-server</module>
-            <module>activemq6-jms-client</module>
-            <module>activemq6-jms-server</module>
-            <module>activemq6-native</module>
-            <module>activemq6-journal</module>
-            <module>activemq6-ra</module>
-            <module>activemq6-rest</module>
-            <module>activemq6-service-sar</module>
-            <module>activemq6-tools</module>
-            <module>integration/activemq6-jboss-as-integration</module>
-            <module>integration/activemq6-spring-integration</module>
-            <module>integration/activemq6-twitter-integration</module>
-            <module>integration/activemq6-aerogear-integration</module>
-            <module>integration/activemq6-vertx-integration</module>
+            <module>activemq-dto</module>
+            <module>activemq-bootstrap</module>
+            <module>activemq-commons</module>
+            <module>activemq-selector</module>
+            <module>activemq-core-client</module>
+            <module>activemq-server</module>
+            <module>activemq-jms-client</module>
+            <module>activemq-jms-server</module>
+            <module>activemq-native</module>
+            <module>activemq-journal</module>
+            <module>activemq-ra</module>
+            <module>activemq-rest</module>
+            <module>activemq-service-sar</module>
+            <module>activemq-tools</module>
+            <module>integration/activemq-jboss-as-integration</module>
+            <module>integration/activemq-spring-integration</module>
+            <module>integration/activemq-twitter-integration</module>
+            <module>integration/activemq-aerogear-integration</module>
+            <module>integration/activemq-vertx-integration</module>
             <module>examples</module>
             <module>docs</module>
             <module>distribution</module>
@@ -553,25 +553,25 @@
       <profile>
          <id>hudson-tests</id>
          <modules>
-            <module>activemq6-dto</module>
-            <module>activemq6-bootstrap</module>
-            <module>activemq6-commons</module>
-            <module>activemq6-selector</module>
-            <module>activemq6-core-client</module>
-            <module>activemq6-server</module>
-            <module>activemq6-jms-client</module>
-            <module>activemq6-jms-server</module>
-            <module>activemq6-native</module>
-            <module>activemq6-journal</module>
-            <module>activemq6-ra</module>
-            <module>activemq6-rest</module>
-            <module>activemq6-service-sar</module>
-            <module>activemq6-tools</module>
-            <module>integration/activemq6-jboss-as-integration</module>
-            <module>integration/activemq6-spring-integration</module>
-            <module>integration/activemq6-twitter-integration</module>
-            <module>integration/activemq6-aerogear-integration</module>
-            <module>integration/activemq6-vertx-integration</module>
+            <module>activemq-dto</module>
+            <module>activemq-bootstrap</module>
+            <module>activemq-commons</module>
+            <module>activemq-selector</module>
+            <module>activemq-core-client</module>
+            <module>activemq-server</module>
+            <module>activemq-jms-client</module>
+            <module>activemq-jms-server</module>
+            <module>activemq-native</module>
+            <module>activemq-journal</module>
+            <module>activemq-ra</module>
+            <module>activemq-rest</module>
+            <module>activemq-service-sar</module>
+            <module>activemq-tools</module>
+            <module>integration/activemq-jboss-as-integration</module>
+            <module>integration/activemq-spring-integration</module>
+            <module>integration/activemq-twitter-integration</module>
+            <module>integration/activemq-aerogear-integration</module>
+            <module>integration/activemq-vertx-integration</module>
             <module>tests</module>
          </modules>
          <properties>
@@ -591,25 +591,25 @@
       <profile>
          <id>jenkins-fast-tests</id>
          <modules>
-            <module>activemq6-dto</module>
-            <module>activemq6-bootstrap</module>
-            <module>activemq6-commons</module>
-            <module>activemq6-selector</module>
-            <module>activemq6-core-client</module>
-            <module>activemq6-server</module>
-            <module>activemq6-jms-client</module>
-            <module>activemq6-jms-server</module>
-            <module>activemq6-native</module>
-            <module>activemq6-journal</module>
-            <module>activemq6-ra</module>
-            <module>activemq6-rest</module>
-            <module>activemq6-service-sar</module>
-            <module>activemq6-tools</module>
-            <module>integration/activemq6-jboss-as-integration</module>
-            <module>integration/activemq6-spring-integration</module>
-            <module>integration/activemq6-twitter-integration</module>
-            <module>integration/activemq6-aerogear-integration</module>
-            <module>integration/activemq6-vertx-integration</module>
+            <module>activemq-dto</module>
+            <module>activemq-bootstrap</module>
+            <module>activemq-commons</module>
+            <module>activemq-selector</module>
+            <module>activemq-core-client</module>
+            <module>activemq-server</module>
+            <module>activemq-jms-client</module>
+            <module>activemq-jms-server</module>
+            <module>activemq-native</module>
+            <module>activemq-journal</module>
+            <module>activemq-ra</module>
+            <module>activemq-rest</module>
+            <module>activemq-service-sar</module>
+            <module>activemq-tools</module>
+            <module>integration/activemq-jboss-as-integration</module>
+            <module>integration/activemq-spring-integration</module>
+            <module>integration/activemq-twitter-integration</module>
+            <module>integration/activemq-aerogear-integration</module>
+            <module>integration/activemq-vertx-integration</module>
             <module>tests</module>
          </modules>
          <properties>
@@ -625,25 +625,25 @@
       <profile>
          <id>examples</id>
          <modules>
-            <module>activemq6-dto</module>
-            <module>activemq6-bootstrap</module>
-            <module>activemq6-commons</module>
-            <module>activemq6-selector</module>
-            <module>activemq6-core-client</module>
-            <module>activemq6-server</module>
-            <module>activemq6-jms-client</module>
-            <module>activemq6-jms-server</module>
-            <module>activemq6-native</module>
-            <module>activemq6-journal</module>
-            <module>activemq6-ra</module>
-            <module>activemq6-rest</module>
-            <module>activemq6-service-sar</module>
-            <module>activemq6-tools</module>
-            <module>integration/activemq6-jboss-as-integration</module>
-            <module>integration/activemq6-spring-integration</module>
-            <module>integration/activemq6-twitter-integration</module>
-            <module>integration/activemq6-aerogear-integration</module>
-            <module>integration/activemq6-vertx-integration</module>
+            <module>activemq-dto</module>
+            <module>activemq-bootstrap</module>
+            <module>activemq-commons</module>
+            <module>activemq-selector</module>
+            <module>activemq-core-client</module>
+            <module>activemq-server</module>
+            <module>activemq-jms-client</module>
+            <module>activemq-jms-server</module>
+            <module>activemq-native</module>
+            <module>activemq-journal</module>
+            <module>activemq-ra</module>
+            <module>activemq-rest</module>
+            <module>activemq-service-sar</module>
+            <module>activemq-tools</module>
+            <module>integration/activemq-jboss-as-integration</module>
+            <module>integration/activemq-spring-integration</module>
+            <module>integration/activemq-twitter-integration</module>
+            <module>integration/activemq-aerogear-integration</module>
+            <module>integration/activemq-vertx-integration</module>
             <module>tests</module>
             <module>examples</module>
          </modules>
@@ -799,8 +799,8 @@
             </plugin>
             <!-- Many examples use it -->
             <plugin>
-               <groupId>org.apache.activemq6</groupId>
-               <artifactId>activemq6-maven-plugin</artifactId>
+               <groupId>org.apache.activemq</groupId>
+               <artifactId>activemq-maven-plugin</artifactId>
                <version>1.2.0</version>
             </plugin>
          </plugins>
@@ -907,7 +907,7 @@
                   <exclude>**/filter/impl/Operator.java</exclude>
                   <exclude>**/filter/impl/RegExp.java</exclude>
                   <exclude>**/utils/UUID*.java</exclude>
-                  <exclude>**/org/apache/activemq6/selector/**</exclude>
+                  <exclude>**/org/apache/activemq/selector/**</exclude>
                </excludes>
                <useDefaultExcludes>true</useDefaultExcludes>
                <strictCheck>true</strictCheck>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/scripts/replace-wildfly.sh
----------------------------------------------------------------------
diff --git a/scripts/replace-wildfly.sh b/scripts/replace-wildfly.sh
index ef298bf..bc70bcd 100755
--- a/scripts/replace-wildfly.sh
+++ b/scripts/replace-wildfly.sh
@@ -9,21 +9,21 @@ export JBOSS_HOME=$1
 # fis the VERSION before running it
 export VERSION="2.4.0-SNAPSHOT"
 #replace jars
-echo cp ./hornetq-core-client/target/hornetq-core-client-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq6/main/hornetq-core-client*.jar
-cp ./hornetq-core-client/target/hornetq-core-client-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq6/main/hornetq-core-client*.jar
-cp ./hornetq-server/target/hornetq-server-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq6/main/hornetq-server*.jar
-cp ./hornetq-commons/target/hornetq-commons-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq6/main/hornetq-commons*.jar
-cp ./hornetq-journal/target/hornetq-journal-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq6/main/hornetq-journal*.jar
-cp ./hornetq-jms-client/target/hornetq-jms-client-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq6/main/hornetq-jms-client*.jar
-cp ./hornetq-jms-server/target/hornetq-jms-server-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq6/main/hornetq-jms-server*.jar
-cp ./hornetq-ra/target/hornetq-ra-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq6/ra/main/hornetq-ra*.jar
+echo cp ./hornetq-core-client/target/hornetq-core-client-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-core-client*.jar
+cp ./hornetq-core-client/target/hornetq-core-client-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-core-client*.jar
+cp ./hornetq-server/target/hornetq-server-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-server*.jar
+cp ./hornetq-commons/target/hornetq-commons-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-commons*.jar
+cp ./hornetq-journal/target/hornetq-journal-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-journal*.jar
+cp ./hornetq-jms-client/target/hornetq-jms-client-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-jms-client*.jar
+cp ./hornetq-jms-server/target/hornetq-jms-server-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-jms-server*.jar
+cp ./hornetq-ra/target/hornetq-ra-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/ra/main/hornetq-ra*.jar
 
 #update jboss-client.jar
 rm -rf tmp
 mkdir ./tmp
 cd ./tmp
 unzip $JBOSS_HOME/bin/client/jboss-client.jar
-rm -rf ./org.apache.activemq6
+rm -rf ./org.apache.activemq
 unzip -o ../hornetq-jms-client/target/hornetq-jms-client-$VERSION.jar  -x META-INF\*
 unzip -o ../hornetq-core-client/target/hornetq-core-client-$VERSION.jar -x \*META-INF\* 
 unzip -o ../hornetq-commons/target/hornetq-commons-$VERSION.jar -x \*META-INF\*

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/byteman-tests/pom.xml b/tests/byteman-tests/pom.xml
index d4e5fea..0d57ce2 100644
--- a/tests/byteman-tests/pom.xml
+++ b/tests/byteman-tests/pom.xml
@@ -2,8 +2,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.apache.activemq6.tests</groupId>
-      <artifactId>activemq6-tests-pom</artifactId>
+      <groupId>org.apache.activemq.tests</groupId>
+      <artifactId>activemq-tests-pom</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
@@ -59,51 +59,51 @@
          <systemPath>${tools.jar}</systemPath>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-core-client</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-core-client</artifactId>
          <version>${project.version}</version>
          <scope>test</scope>
          <type>test-jar</type>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-server</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-server</artifactId>
          <version>${project.version}</version>
          <scope>test</scope>
          <type>test-jar</type>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6.tests</groupId>
+         <groupId>org.apache.activemq.tests</groupId>
          <artifactId>integration-tests</artifactId>
          <version>${project.version}</version>
          <scope>test</scope>
          <type>test-jar</type>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6.tests</groupId>
+         <groupId>org.apache.activemq.tests</groupId>
          <artifactId>unit-tests</artifactId>
          <version>${project.version}</version>
          <scope>test</scope>
          <type>test-jar</type>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-jms-client</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-jms-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-jms-server</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-jms-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-ra</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-ra</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-bootstrap</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-bootstrap</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -185,7 +185,7 @@
             <configuration>
                <skipTests>${skipBytemanTests}</skipTests>
                <includes>
-                  <include>org.apache.activemq6/byteman/tests/*.java</include>
+                  <include>org.apache.activemq/byteman/tests/*.java</include>
                </includes>
                <!-- ensure we don't inherit a byteman jar form any env settings -->
                <environmentVariables>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BMFailoverTest.java
----------------------------------------------------------------------
diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BMFailoverTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BMFailoverTest.java
index c97d9fa..dd78991 100644
--- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BMFailoverTest.java
+++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BMFailoverTest.java
@@ -11,34 +11,34 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.byteman.tests;
+package org.apache.activemq.byteman.tests;
 
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq6.api.core.HornetQTransactionOutcomeUnknownException;
-import org.apache.activemq6.api.core.HornetQTransactionRolledBackException;
-import org.apache.activemq6.api.core.HornetQUnBlockedException;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClientConsumer;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.api.core.client.ClientProducer;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.api.core.client.ServerLocator;
-import org.apache.activemq6.core.client.HornetQClientMessageBundle;
-import org.apache.activemq6.core.client.impl.ClientMessageImpl;
-import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq6.core.client.impl.ClientSessionInternal;
-import org.apache.activemq6.core.postoffice.Binding;
-import org.apache.activemq6.core.server.Queue;
-import org.apache.activemq6.core.transaction.impl.XidImpl;
-import org.apache.activemq6.tests.integration.cluster.failover.FailoverTestBase;
-import org.apache.activemq6.tests.integration.cluster.util.TestableServer;
-import org.apache.activemq6.tests.util.RandomUtil;
-import org.apache.activemq6.utils.UUIDGenerator;
+import org.apache.activemq.api.core.HornetQTransactionOutcomeUnknownException;
+import org.apache.activemq.api.core.HornetQTransactionRolledBackException;
+import org.apache.activemq.api.core.HornetQUnBlockedException;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ClientConsumer;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.api.core.client.ClientProducer;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.api.core.client.ServerLocator;
+import org.apache.activemq.core.client.HornetQClientMessageBundle;
+import org.apache.activemq.core.client.impl.ClientMessageImpl;
+import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.core.postoffice.Binding;
+import org.apache.activemq.core.server.Queue;
+import org.apache.activemq.core.transaction.impl.XidImpl;
+import org.apache.activemq.tests.integration.cluster.failover.FailoverTestBase;
+import org.apache.activemq.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.utils.UUIDGenerator;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -109,10 +109,10 @@ public class BMFailoverTest extends FailoverTestBase
                      @BMRule
                            (
                                  name = "trace HornetQSessionContext xaEnd",
-                                 targetClass = "org.apache.activemq6.core.protocol.core.impl.HornetQSessionContext",
+                                 targetClass = "org.apache.activemq.core.protocol.core.impl.HornetQSessionContext",
                                  targetMethod = "xaEnd",
                                  targetLocation = "AT EXIT",
-                                 action = "org.apache.activemq6.byteman.tests.BMFailoverTest.stopAndThrow()"
+                                 action = "org.apache.activemq.byteman.tests.BMFailoverTest.stopAndThrow()"
                            )
                }
    )
@@ -200,10 +200,10 @@ public class BMFailoverTest extends FailoverTestBase
                @BMRule
                   (
                      name = "trace clientsessionimpl commit",
-                     targetClass = "org.apache.activemq6.core.client.impl.ClientSessionImpl",
+                     targetClass = "org.apache.activemq.core.client.impl.ClientSessionImpl",
                      targetMethod = "start(javax.transaction.xa.Xid, int)",
                      targetLocation = "AT EXIT",
-                     action = "org.apache.activemq6.byteman.tests.BMFailoverTest.serverToStop.getServer().stop(true)"
+                     action = "org.apache.activemq.byteman.tests.BMFailoverTest.serverToStop.getServer().stop(true)"
                   )
             }
       )
@@ -303,10 +303,10 @@ public class BMFailoverTest extends FailoverTestBase
                @BMRule
                   (
                      name = "trace clientsessionimpl commit",
-                     targetClass = "org.apache.activemq6.core.client.impl.ClientSessionImpl",
+                     targetClass = "org.apache.activemq.core.client.impl.ClientSessionImpl",
                      targetMethod = "commit",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq6.byteman.tests.BMFailoverTest.serverToStop.getServer().stop(true)"
+                     action = "org.apache.activemq.byteman.tests.BMFailoverTest.serverToStop.getServer().stop(true)"
                   )
             }
       )
@@ -344,10 +344,10 @@ public class BMFailoverTest extends FailoverTestBase
                @BMRule
                   (
                      name = "trace clientsessionimpl commit",
-                     targetClass = "org.apache.activemq6.core.client.impl.ClientSessionImpl",
+                     targetClass = "org.apache.activemq.core.client.impl.ClientSessionImpl",
                      targetMethod = "commit",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq6.byteman.tests.BMFailoverTest.serverToStop.getServer().stop(true)"
+                     action = "org.apache.activemq.byteman.tests.BMFailoverTest.serverToStop.getServer().stop(true)"
                   )
             }
       )

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BridgeServerLocatorConfigurationTest.java
----------------------------------------------------------------------
diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BridgeServerLocatorConfigurationTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BridgeServerLocatorConfigurationTest.java
index a1ac3ae..a2ea0e8 100644
--- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BridgeServerLocatorConfigurationTest.java
+++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BridgeServerLocatorConfigurationTest.java
@@ -10,21 +10,21 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.byteman.tests;
+package org.apache.activemq.byteman.tests;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ServerLocator;
-import org.apache.activemq6.core.config.BridgeConfiguration;
-import org.apache.activemq6.core.config.CoreQueueConfiguration;
-import org.apache.activemq6.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq6.core.server.HornetQServer;
-import org.apache.activemq6.core.server.cluster.impl.BridgeImpl;
-import org.apache.activemq6.tests.util.ServiceTestBase;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ServerLocator;
+import org.apache.activemq.core.config.BridgeConfiguration;
+import org.apache.activemq.core.config.CoreQueueConfiguration;
+import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.core.server.HornetQServer;
+import org.apache.activemq.core.server.cluster.impl.BridgeImpl;
+import org.apache.activemq.tests.util.ServiceTestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
 import org.junit.Test;
@@ -53,7 +53,7 @@ public class BridgeServerLocatorConfigurationTest extends ServiceTestBase
 
    @Test
    @BMRule(name = "check connection ttl",
-            targetClass = "org.apache.activemq6.byteman.tests.BridgeServerLocatorConfigurationTest",
+            targetClass = "org.apache.activemq.byteman.tests.BridgeServerLocatorConfigurationTest",
             targetMethod = "getBridgeTTL(HornetQServer, String)", targetLocation = "EXIT",
             action = "$! = $0.getConfiguredBridge($1).serverLocator.getConnectionTTL();")
    /**
@@ -72,7 +72,7 @@ public class BridgeServerLocatorConfigurationTest extends ServiceTestBase
       Map<String, Object> server1Params = new HashMap<String, Object>();
       if (isNetty())
       {
-         server1Params.put("port", org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1);
+         server1Params.put("port", org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1);
       }
       else
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ClusteredGroupingTest.java
----------------------------------------------------------------------
diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ClusteredGroupingTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ClusteredGroupingTest.java
index 8974d54..f5b3b7d 100644
--- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ClusteredGroupingTest.java
+++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ClusteredGroupingTest.java
@@ -10,21 +10,21 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.byteman.tests;
+package org.apache.activemq.byteman.tests;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq6.api.core.HornetQNonExistentQueueException;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.management.ManagementHelper;
-import org.apache.activemq6.api.core.management.CoreNotificationType;
-import org.apache.activemq6.core.server.HornetQServer;
-import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration;
-import org.apache.activemq6.core.server.group.impl.Response;
-import org.apache.activemq6.core.server.management.Notification;
-import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.api.core.HornetQNonExistentQueueException;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.management.ManagementHelper;
+import org.apache.activemq.api.core.management.CoreNotificationType;
+import org.apache.activemq.core.server.HornetQServer;
+import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration;
+import org.apache.activemq.core.server.group.impl.Response;
+import org.apache.activemq.core.server.management.Notification;
+import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -47,18 +47,18 @@ public class ClusteredGroupingTest extends ClusterTestBase
                @BMRule
                   (
                      name = "blow-up",
-                     targetClass = "org.apache.activemq6.core.server.group.impl.LocalGroupingHandler",
+                     targetClass = "org.apache.activemq.core.server.group.impl.LocalGroupingHandler",
                      targetMethod = "removeGrouping",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.pause($1);"
+                     action = "org.apache.activemq.byteman.tests.ClusteredGroupingTest.pause($1);"
                   ),
                @BMRule
                   (
                      name = "blow-up2",
-                     targetClass = "org.apache.activemq6.core.server.group.impl.GroupHandlingAbstract",
+                     targetClass = "org.apache.activemq.core.server.group.impl.GroupHandlingAbstract",
                      targetMethod = "forceRemove",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.restart2();"
+                     action = "org.apache.activemq.byteman.tests.ClusteredGroupingTest.restart2();"
                   )
             }
       )
@@ -124,16 +124,16 @@ public class ClusteredGroupingTest extends ClusterTestBase
                @BMRule
                   (
                      name = "blow-up",
-                     targetClass = "org.apache.activemq6.core.server.group.impl.RemoteGroupingHandler",
+                     targetClass = "org.apache.activemq.core.server.group.impl.RemoteGroupingHandler",
                      targetMethod = "onNotification",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.pause2($1);"
+                     action = "org.apache.activemq.byteman.tests.ClusteredGroupingTest.pause2($1);"
                   ),
                @BMRule(name = "blow-up2",
-                       targetClass = "org.apache.activemq6.core.server.group.impl.RemoteGroupingHandler",
+                       targetClass = "org.apache.activemq.core.server.group.impl.RemoteGroupingHandler",
                        targetMethod = "remove",
                        targetLocation = "ENTRY",
-                       action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.restart2();")
+                       action = "org.apache.activemq.byteman.tests.ClusteredGroupingTest.restart2();")
             }
       )
    public void test3serversLocalGoesDown() throws Exception
@@ -209,16 +209,16 @@ public class ClusteredGroupingTest extends ClusterTestBase
                @BMRule
                   (
                      name = "blow-up",
-                     targetClass = "org.apache.activemq6.core.server.group.impl.LocalGroupingHandler",
+                     targetClass = "org.apache.activemq.core.server.group.impl.LocalGroupingHandler",
                      targetMethod = "onNotification",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.pause2($1);"
+                     action = "org.apache.activemq.byteman.tests.ClusteredGroupingTest.pause2($1);"
                   ),
                @BMRule(name = "blow-up2",
-                       targetClass = "org.apache.activemq6.core.server.group.impl.LocalGroupingHandler",
+                       targetClass = "org.apache.activemq.core.server.group.impl.LocalGroupingHandler",
                        targetMethod = "remove",
                        targetLocation = "ENTRY",
-                       action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.restart2();")
+                       action = "org.apache.activemq.byteman.tests.ClusteredGroupingTest.restart2();")
             }
       )
    public void testLocal3serversLocalGoesDown() throws Exception
@@ -294,16 +294,16 @@ public class ClusteredGroupingTest extends ClusterTestBase
                @BMRule
                   (
                      name = "blow-up",
-                     targetClass = "org.apache.activemq6.core.server.group.impl.LocalGroupingHandler",
+                     targetClass = "org.apache.activemq.core.server.group.impl.LocalGroupingHandler",
                      targetMethod = "onNotification",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.pause2($1);"
+                     action = "org.apache.activemq.byteman.tests.ClusteredGroupingTest.pause2($1);"
                   ),
                @BMRule(name = "blow-up2",
-                       targetClass = "org.apache.activemq6.core.server.group.impl.LocalGroupingHandler",
+                       targetClass = "org.apache.activemq.core.server.group.impl.LocalGroupingHandler",
                        targetMethod = "remove",
                        targetLocation = "ENTRY",
-                       action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.restart2();")
+                       action = "org.apache.activemq.byteman.tests.ClusteredGroupingTest.restart2();")
             }
       )
    public void testLocal4serversLocalGoesDown() throws Exception

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/GroupingTest.java
----------------------------------------------------------------------
diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/GroupingTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/GroupingTest.java
index bc00810..f421238 100644
--- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/GroupingTest.java
+++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/GroupingTest.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.byteman.tests;
+package org.apache.activemq.byteman.tests;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,10 +21,10 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq6.api.core.HornetQNotConnectedException;
-import org.apache.activemq6.jms.client.HornetQConnectionFactory;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
-import org.apache.activemq6.tests.util.JMSTestBase;
+import org.apache.activemq.api.core.HornetQNotConnectedException;
+import org.apache.activemq.jms.client.HornetQConnectionFactory;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.tests.util.JMSTestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -74,10 +74,10 @@ public class GroupingTest extends JMSTestBase
                @BMRule
                   (
                      name = "trace clientsessionimpl commit",
-                     targetClass = "org.apache.activemq6.core.server.impl.ServerSessionImpl",
+                     targetClass = "org.apache.activemq.core.server.impl.ServerSessionImpl",
                      targetMethod = "rollback",
                      targetLocation = "EXIT",
-                     action = "org.apache.activemq6.byteman.tests.GroupingTest.pause();"
+                     action = "org.apache.activemq.byteman.tests.GroupingTest.pause();"
                   )
             }
       )

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/HornetQMessageHandlerTest.java
----------------------------------------------------------------------
diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/HornetQMessageHandlerTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/HornetQMessageHandlerTest.java
index 2b8a8c7..12c5243 100644
--- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/HornetQMessageHandlerTest.java
+++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/HornetQMessageHandlerTest.java
@@ -10,22 +10,22 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.byteman.tests;
+package org.apache.activemq.byteman.tests;
 
 import com.arjuna.ats.arjuna.coordinator.TransactionReaper;
 import com.arjuna.ats.arjuna.coordinator.TxControl;
 import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientConsumer;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.api.core.client.ClientProducer;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.core.postoffice.Binding;
-import org.apache.activemq6.core.server.Queue;
-import org.apache.activemq6.ra.HornetQResourceAdapter;
-import org.apache.activemq6.ra.inflow.HornetQActivationSpec;
-import org.apache.activemq6.tests.integration.ra.HornetQRATestBase;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientConsumer;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.api.core.client.ClientProducer;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.core.postoffice.Binding;
+import org.apache.activemq.core.server.Queue;
+import org.apache.activemq.ra.HornetQResourceAdapter;
+import org.apache.activemq.ra.inflow.HornetQActivationSpec;
+import org.apache.activemq.tests.integration.ra.HornetQRATestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -74,10 +74,10 @@ public class HornetQMessageHandlerTest extends HornetQRATestBase
                @BMRule
                      (
                            name = "interrupt",
-                           targetClass = "org.apache.activemq6.core.protocol.core.impl.HornetQSessionContext",
+                           targetClass = "org.apache.activemq.core.protocol.core.impl.HornetQSessionContext",
                            targetMethod = "xaEnd",
                            targetLocation = "ENTRY",
-                           action = "org.apache.activemq6.byteman.tests.HornetQMessageHandlerTest.interrupt();"
+                           action = "org.apache.activemq.byteman.tests.HornetQMessageHandlerTest.interrupt();"
                      )
             }
    )
@@ -154,10 +154,10 @@ public class HornetQMessageHandlerTest extends HornetQRATestBase
                            @BMRule
                                  (
                                        name = "interrupt",
-                                       targetClass = "org.apache.activemq6.core.protocol.core.impl.HornetQSessionContext",
+                                       targetClass = "org.apache.activemq.core.protocol.core.impl.HornetQSessionContext",
                                        targetMethod = "xaEnd",
                                        targetLocation = "ENTRY",
-                                       action = "org.apache.activemq6.byteman.tests.HornetQMessageHandlerTest.interrupt();"
+                                       action = "org.apache.activemq.byteman.tests.HornetQMessageHandlerTest.interrupt();"
                                  )
                      }
          )


Mime
View raw message