ACTIVEMQ6-4 - Rename packages to ActiveMQ

https://issues.apache.org/jira/browse/ACTIVEMQ6-4

Repackage the modules, java source and maven poms to apache.activemq6

activemq6-bootstrap/pom.xml

@@ -3,14 +3,14 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.hornetq</groupId>
+      <groupId>org.apache.activemq6</groupId>
-      <artifactId>hornetq-pom</artifactId>
+      <artifactId>activemq6-pom</artifactId>
-      <version>2.5.0-SNAPSHOT</version>
+      <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>hornetq-bootstrap</artifactId>
+   <artifactId>activemq6-bootstrap</artifactId>
    <packaging>jar</packaging>
-   <name>HornetQ Bootstrap</name>
+   <name>ActiveMQ6 Bootstrap</name>
 
    <properties>
       <hornetq.basedir>${project.basedir}/..</hornetq.basedir>
@@ -18,18 +18,18 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.hornetq</groupId>
+         <groupId>org.apache.activemq6</groupId>
-         <artifactId>hornetq-server</artifactId>
+         <artifactId>activemq6-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.hornetq</groupId>
+         <groupId>org.apache.activemq6</groupId>
-         <artifactId>hornetq-jms-server</artifactId>
+         <artifactId>activemq6-jms-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.hornetq</groupId>
+         <groupId>org.apache.activemq6</groupId>
-         <artifactId>hornetq-dto</artifactId>
+         <artifactId>activemq6-dto</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/ConfigurationException.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.cli;
+package org.apache.activemq6.cli;
 
 public class ConfigurationException extends Exception
 {

activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/HornetQ.java

@@ -10,15 +10,15 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.cli;
+package org.apache.activemq6.cli;
 
 import io.airlift.command.Cli;
 import io.airlift.command.ParseArgumentsUnexpectedException;
-import org.hornetq.cli.commands.Action;
+import org.apache.activemq6.cli.commands.Action;
-import org.hornetq.cli.commands.ActionContext;
+import org.apache.activemq6.cli.commands.ActionContext;
-import org.hornetq.cli.commands.HelpAction;
+import org.apache.activemq6.cli.commands.HelpAction;
-import org.hornetq.cli.commands.Run;
+import org.apache.activemq6.cli.commands.Run;
-import org.hornetq.cli.commands.Stop;
+import org.apache.activemq6.cli.commands.Stop;
 
 import java.io.InputStream;
 import java.io.OutputStream;

activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Action.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.cli.commands;
+package org.apache.activemq6.cli.commands;
 
 public interface Action
 {

activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/ActionContext.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.cli.commands;
+package org.apache.activemq6.cli.commands;
 
 import java.io.InputStream;
 import java.io.PrintStream;

activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/HelpAction.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.cli.commands;
+package org.apache.activemq6.cli.commands;
 
 import io.airlift.command.Help;
 

activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Run.java

@@ -10,25 +10,25 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.cli.commands;
+package org.apache.activemq6.cli.commands;
 
 import io.airlift.command.Arguments;
 import io.airlift.command.Command;
 
-import org.hornetq.cli.HornetQ;
+import org.apache.activemq6.cli.HornetQ;
-import org.hornetq.core.config.Configuration;
+import org.apache.activemq6.core.config.Configuration;
-import org.hornetq.core.server.impl.HornetQServerImpl;
+import org.apache.activemq6.core.server.impl.HornetQServerImpl;
-import org.hornetq.dto.BrokerDTO;
+import org.apache.activemq6.dto.BrokerDTO;
-import org.hornetq.factory.BrokerFactory;
+import org.apache.activemq6.factory.BrokerFactory;
-import org.hornetq.factory.CoreFactory;
+import org.apache.activemq6.factory.CoreFactory;
-import org.hornetq.factory.JmsFactory;
+import org.apache.activemq6.factory.JmsFactory;
-import org.hornetq.factory.SecurityManagerFactory;
+import org.apache.activemq6.factory.SecurityManagerFactory;
-import org.hornetq.integration.bootstrap.HornetQBootstrapLogger;
+import org.apache.activemq6.integration.bootstrap.HornetQBootstrapLogger;
-import org.hornetq.jms.server.JMSServerManager;
+import org.apache.activemq6.jms.server.JMSServerManager;
-import org.hornetq.jms.server.config.JMSConfiguration;
+import org.apache.activemq6.jms.server.config.JMSConfiguration;
-import org.hornetq.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl;
-import org.hornetq.jms.server.impl.StandaloneNamingServer;
+import org.apache.activemq6.jms.server.impl.StandaloneNamingServer;
-import org.hornetq.spi.core.security.HornetQSecurityManager;
+import org.apache.activemq6.spi.core.security.HornetQSecurityManager;
 
 import javax.management.MBeanServer;
 

activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Stop.java

@@ -10,12 +10,12 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.cli.commands;
+package org.apache.activemq6.cli.commands;
 
 import io.airlift.command.Arguments;
 import io.airlift.command.Command;
-import org.hornetq.dto.BrokerDTO;
+import org.apache.activemq6.dto.BrokerDTO;
-import org.hornetq.factory.BrokerFactory;
+import org.apache.activemq6.factory.BrokerFactory;
 
 import java.io.File;
 

activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/BrokerFactory.java

@@ -10,11 +10,11 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.factory;
+package org.apache.activemq6.factory;
 
-import org.hornetq.cli.ConfigurationException;
+import org.apache.activemq6.cli.ConfigurationException;
-import org.hornetq.dto.BrokerDTO;
+import org.apache.activemq6.dto.BrokerDTO;
-import org.hornetq.utils.FactoryFinder;
+import org.apache.activemq6.utils.FactoryFinder;
 
 import java.io.IOException;
 import java.net.URI;
@@ -32,7 +32,7 @@ public class BrokerFactory
       BrokerFactoryHandler factory = null;
       try
       {
-         FactoryFinder finder = new FactoryFinder("META-INF/services/org/hornetq/broker/");
+         FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq6/broker/");
          factory = (BrokerFactoryHandler)finder.newInstance(configURI.getScheme());
       }
       catch (IOException ioe )

activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/BrokerFactoryHandler.java

@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.factory;
+package org.apache.activemq6.factory;
 
-import org.hornetq.dto.BrokerDTO;
+import org.apache.activemq6.dto.BrokerDTO;
 
 import java.net.URI;
 

activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/CoreFactory.java

@@ -10,13 +10,13 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.factory;
+package org.apache.activemq6.factory;
 
-import org.hornetq.cli.ConfigurationException;
+import org.apache.activemq6.cli.ConfigurationException;
-import org.hornetq.core.config.Configuration;
+import org.apache.activemq6.core.config.Configuration;
-import org.hornetq.core.config.impl.ConfigurationImpl;
+import org.apache.activemq6.core.config.impl.ConfigurationImpl;
-import org.hornetq.dto.CoreDTO;
+import org.apache.activemq6.dto.CoreDTO;
-import org.hornetq.utils.FactoryFinder;
+import org.apache.activemq6.utils.FactoryFinder;
 
 import java.io.IOException;
 import java.net.URI;
@@ -31,7 +31,7 @@ public class CoreFactory
          URI configURI = new URI(core.configuration.replace("\\", "/"));
          try
          {
-            FactoryFinder finder = new FactoryFinder("META-INF/services/org/hornetq/broker/core/");
+            FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq6/broker/core/");
             factory = (CoreFactoryHandler)finder.newInstance(configURI.getScheme());
          }
          catch (IOException ioe )

activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/CoreFactoryHandler.java

@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.factory;
+package org.apache.activemq6.factory;
 
-import org.hornetq.core.config.Configuration;
+import org.apache.activemq6.core.config.Configuration;
 
 import java.net.URI;
 

activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/FileCoreFactoryHandler.java

@@ -10,10 +10,10 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.factory;
+package org.apache.activemq6.factory;
 
-import org.hornetq.core.config.Configuration;
+import org.apache.activemq6.core.config.Configuration;
-import org.hornetq.core.config.impl.FileConfiguration;
+import org.apache.activemq6.core.config.impl.FileConfiguration;
 
 import java.net.URI;
 

activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/FileJmsFactoryHandler.java

@@ -10,10 +10,10 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.factory;
+package org.apache.activemq6.factory;
 
-import org.hornetq.jms.server.config.JMSConfiguration;
+import org.apache.activemq6.jms.server.config.JMSConfiguration;
-import org.hornetq.jms.server.impl.JMSServerConfigParserImpl;
+import org.apache.activemq6.jms.server.impl.JMSServerConfigParserImpl;
 
 import java.io.FileInputStream;
 import java.io.InputStream;

activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/JmsFactory.java

@@ -10,15 +10,15 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.factory;
+package org.apache.activemq6.factory;
 
 import java.io.IOException;
 import java.net.URI;
 
-import org.hornetq.cli.ConfigurationException;
+import org.apache.activemq6.cli.ConfigurationException;
-import org.hornetq.dto.JmsDTO;
+import org.apache.activemq6.dto.JmsDTO;
-import org.hornetq.jms.server.config.JMSConfiguration;
+import org.apache.activemq6.jms.server.config.JMSConfiguration;
-import org.hornetq.utils.FactoryFinder;
+import org.apache.activemq6.utils.FactoryFinder;
 
 public class JmsFactory
 {
@@ -30,7 +30,7 @@ public class JmsFactory
          URI configURI = new URI(jms.configuration.replace("\\", "/"));
          try
          {
-            FactoryFinder finder = new FactoryFinder("META-INF/services/org/hornetq/broker/jms/");
+            FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq6/broker/jms/");
             factory = (JmsFactoryHandler)finder.newInstance(configURI.getScheme());
          }
          catch (IOException ioe )

activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/JmsFactoryHandler.java

@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.factory;
+package org.apache.activemq6.factory;
 
-import org.hornetq.jms.server.config.JMSConfiguration;
+import org.apache.activemq6.jms.server.config.JMSConfiguration;
 
 import java.net.URI;
 

activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/SecurityManagerFactory.java

@@ -10,11 +10,11 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.factory;
+package org.apache.activemq6.factory;
 
-import org.hornetq.dto.SecurityDTO;
+import org.apache.activemq6.dto.SecurityDTO;
-import org.hornetq.spi.core.security.HornetQSecurityManager;
+import org.apache.activemq6.spi.core.security.HornetQSecurityManager;
-import org.hornetq.utils.FactoryFinder;
+import org.apache.activemq6.utils.FactoryFinder;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
@@ -25,7 +25,7 @@ public class SecurityManagerFactory
    {
       if (config != null)
       {
-         FactoryFinder finder = new FactoryFinder("META-INF/services/org/hornetq/security/");
+         FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq6/security/");
          HornetQSecurityManager manager = (HornetQSecurityManager)finder.newInstance(config.getClass().getAnnotation(XmlRootElement.class).name());
          return manager;
       }

activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/XmlBrokerFactoryHandler.java

@@ -10,11 +10,11 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.factory;
+package org.apache.activemq6.factory;
 
-import org.hornetq.cli.ConfigurationException;
+import org.apache.activemq6.cli.ConfigurationException;
-import org.hornetq.dto.BrokerDTO;
+import org.apache.activemq6.dto.BrokerDTO;
-import org.hornetq.dto.XmlUtil;
+import org.apache.activemq6.dto.XmlUtil;
 
 import java.io.File;
 import java.net.URI;

activemq6-bootstrap/src/main/java/org/apache/activemq6/integration/bootstrap/HornetQBootstrapBundle.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.integration.bootstrap;
+package org.apache.activemq6.integration.bootstrap;
 
 
 import org.jboss.logging.annotations.MessageBundle;

activemq6-bootstrap/src/main/java/org/apache/activemq6/integration/bootstrap/HornetQBootstrapLogger.java

@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.integration.bootstrap;
+package org.apache.activemq6.integration.bootstrap;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;

activemq6-commons/pom.xml

@@ -3,14 +3,14 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.hornetq</groupId>
+      <groupId>org.apache.activemq6</groupId>
-      <artifactId>hornetq-pom</artifactId>
+      <artifactId>activemq6-pom</artifactId>
-      <version>2.5.0-SNAPSHOT</version>
+      <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>hornetq-commons</artifactId>
+   <artifactId>activemq6-commons</artifactId>
    <packaging>jar</packaging>
-   <name>HornetQ Commons</name>
+   <name>ActiveMQ6 Commons</name>
 
    <properties>
       <hornetq.basedir>${project.basedir}/..</hornetq.basedir>

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAddressExistsException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.ADDRESS_EXISTS;
+import static org.apache.activemq6.api.core.HornetQExceptionType.ADDRESS_EXISTS;
 
 /**
  * An operation failed because an address exists on the server.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAddressFullException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.ADDRESS_FULL;
+import static org.apache.activemq6.api.core.HornetQExceptionType.ADDRESS_FULL;
 
 /**
  * An address is full.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAlreadyReplicatingException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.ALREADY_REPLICATING;
+import static org.apache.activemq6.api.core.HornetQExceptionType.ALREADY_REPLICATING;
 
 /**
  * The server is already paired with a replicating backup.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQBuffer.java

@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 import java.nio.ByteBuffer;
 

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQBuffers.java

@@ -11,12 +11,12 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 import java.nio.ByteBuffer;
 
 import io.netty.buffer.Unpooled;
-import org.hornetq.core.buffers.impl.ChannelBufferWrapper;
+import org.apache.activemq6.core.buffers.impl.ChannelBufferWrapper;
 
 /**
  * Factory class to create instances of {@link HornetQBuffer}.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQClusterSecurityException.java

@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 /**
  * Security exception thrown when the cluster user fails authentication.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQConnectionTimedOutException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.CONNECTION_TIMEDOUT;
+import static org.apache.activemq6.api.core.HornetQExceptionType.CONNECTION_TIMEDOUT;
 
 /**
  * A client timed out will connecting to HornetQ server.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDisconnectedException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.DISCONNECTED;
+import static org.apache.activemq6.api.core.HornetQExceptionType.DISCONNECTED;
 
 /**
  * A client was disconnected from HornetQ server when the server has shut down.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDuplicateIdException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.DUPLICATE_ID_REJECTED;
+import static org.apache.activemq6.api.core.HornetQExceptionType.DUPLICATE_ID_REJECTED;
 
 /**
  * A DuplicateID was rejected.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDuplicateMetaDataException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.DUPLICATE_METADATA;
+import static org.apache.activemq6.api.core.HornetQExceptionType.DUPLICATE_METADATA;
 
 /**
  * A Session Metadata was set in duplication

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQException.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 /**
  * HornetQException is the root exception for the HornetQ API.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQExceptionType.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 import java.util.Collections;
 import java.util.EnumSet;

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIOErrorException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.IO_ERROR;
+import static org.apache.activemq6.api.core.HornetQExceptionType.IO_ERROR;
 
 /**
  * Unexpected I/O error occurred on the server.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIllegalStateException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.ILLEGAL_STATE;
+import static org.apache.activemq6.api.core.HornetQExceptionType.ILLEGAL_STATE;
 
 /**
  * A HornetQ resource is not in a legal state (e.g. calling ClientConsumer.receive() if a

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIncompatibleClientServerException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.INCOMPATIBLE_CLIENT_SERVER_VERSIONS;
+import static org.apache.activemq6.api.core.HornetQExceptionType.INCOMPATIBLE_CLIENT_SERVER_VERSIONS;
 
 /**
  * The server version and the client version are incompatible.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInterceptorRejectedPacketException.java

@@ -11,13 +11,13 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.INTERCEPTOR_REJECTED_PACKET;
+import static org.apache.activemq6.api.core.HornetQExceptionType.INTERCEPTOR_REJECTED_PACKET;
 
 /**
  * An outgoing interceptor returned false.
- * @see org.hornetq.api.core.client.ServerLocator#addOutgoingInterceptor(org.hornetq.api.core.Interceptor)
+ * @see org.apache.activemq6.api.core.client.ServerLocator#addOutgoingInterceptor(org.hornetq.api.core.Interceptor)
  * @author Justin Bertram
  */
 // XXX I doubt any reader will make much sense of this Javadoc's text.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInternalErrorException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.INTERNAL_ERROR;
+import static org.apache.activemq6.api.core.HornetQExceptionType.INTERNAL_ERROR;
 
 /**
  * Internal error which prevented HornetQ from performing an important operation.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInterruptedException.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 /**
  * When an interruption happens, we will just throw a non-checked exception.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInvalidFilterExpressionException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.INVALID_FILTER_EXPRESSION;
+import static org.apache.activemq6.api.core.HornetQExceptionType.INVALID_FILTER_EXPRESSION;
 
 /**
  * A filter expression was found to be invalid.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInvalidTransientQueueUseException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.INVALID_TRANSIENT_QUEUE_USE;
+import static org.apache.activemq6.api.core.HornetQExceptionType.INVALID_TRANSIENT_QUEUE_USE;
 
 /**
  * An operation failed because a queue exists on the server.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQLargeMessageException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.LARGE_MESSAGE_ERROR_BODY;
+import static org.apache.activemq6.api.core.HornetQExceptionType.LARGE_MESSAGE_ERROR_BODY;
 
 /**
  * A problem occurred while manipulating the body of a large message.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQLargeMessageInterruptedException.java

@@ -11,10 +11,10 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 
-import static org.hornetq.api.core.HornetQExceptionType.LARGE_MESSAGE_INTERRUPTED;
+import static org.apache.activemq6.api.core.HornetQExceptionType.LARGE_MESSAGE_INTERRUPTED;
 
 /**
  * @author Clebert

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNativeIOError.java

@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 
 /**

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNonExistentQueueException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.QUEUE_DOES_NOT_EXIST;
+import static org.apache.activemq6.api.core.HornetQExceptionType.QUEUE_DOES_NOT_EXIST;
 
 /**
  * An operation failed because a queue does not exist on the server.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNotConnectedException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.NOT_CONNECTED;
+import static org.apache.activemq6.api.core.HornetQExceptionType.NOT_CONNECTED;
 
 /**
  * A client is not able to connect to HornetQ server.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQObjectClosedException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.OBJECT_CLOSED;
+import static org.apache.activemq6.api.core.HornetQExceptionType.OBJECT_CLOSED;
 
 /**
  * A client operation failed because the calling resource (ClientSession, ClientProducer, etc.) is

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQPropertyConversionException.java

@@ -10,13 +10,13 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 /**
- * A PropertyConversionException is thrown by {@code org.hornetq.api.core.Message} methods when a
+ * A PropertyConversionException is thrown by {@code org.apache.activemq6.api.core.Message} methods when a
  * property can not be converted to the expected type.
  * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- * @see org.hornetq.api.core.Message
+ * @see org.apache.activemq6.api.core.Message
  */
 public final class HornetQPropertyConversionException extends RuntimeException
 {

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQQueueExistsException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.QUEUE_EXISTS;
+import static org.apache.activemq6.api.core.HornetQExceptionType.QUEUE_EXISTS;
 
 /**
  * An operation failed because a queue exists on the server.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQSecurityException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.SECURITY_EXCEPTION;
+import static org.apache.activemq6.api.core.HornetQExceptionType.SECURITY_EXCEPTION;
 
 /**
  * A security problem occurred (authentication issues, permission issues,...)

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQSessionCreationException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.SESSION_CREATION_REJECTED;
+import static org.apache.activemq6.api.core.HornetQExceptionType.SESSION_CREATION_REJECTED;
 
 /**
  * The creation of a session was rejected by the server (e.g. if the server is starting and has not

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQTransactionOutcomeUnknownException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.TRANSACTION_OUTCOME_UNKNOWN;
+import static org.apache.activemq6.api.core.HornetQExceptionType.TRANSACTION_OUTCOME_UNKNOWN;
 
 /**
  * The outcome of a transaction is unknown.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQTransactionRolledBackException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.TRANSACTION_ROLLED_BACK;
+import static org.apache.activemq6.api.core.HornetQExceptionType.TRANSACTION_ROLLED_BACK;
 
 /**
  * A transaction was rolled back.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQUnBlockedException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.UNBLOCKED;
+import static org.apache.activemq6.api.core.HornetQExceptionType.UNBLOCKED;
 
 /**
  * A blocking call from a client was unblocked during failover.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQUnsupportedPacketException.java

@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import static org.hornetq.api.core.HornetQExceptionType.UNSUPPORTED_PACKET;
+import static org.apache.activemq6.api.core.HornetQExceptionType.UNSUPPORTED_PACKET;
 
 /**
  * A packet of unsupported type was received by HornetQ PacketHandler.

activemq6-commons/src/main/java/org/apache/activemq6/api/core/Pair.java

@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 import java.io.Serializable;
 

activemq6-commons/src/main/java/org/apache/activemq6/api/core/SimpleString.java

@@ -11,13 +11,13 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hornetq.utils.DataConstants;
+import org.apache.activemq6.utils.DataConstants;
 
 /**
  * A simple String class that can store all characters, and stores as simple {@code byte[]}, this

activemq6-commons/src/main/java/org/apache/activemq6/core/buffers/impl/ChannelBufferWrapper.java

@@ -11,16 +11,16 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.core.buffers.impl;
+package org.apache.activemq6.core.buffers.impl;
 
 import java.nio.ByteBuffer;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import org.hornetq.api.core.HornetQBuffer;
+import org.apache.activemq6.api.core.HornetQBuffer;
-import org.hornetq.api.core.SimpleString;
+import org.apache.activemq6.api.core.SimpleString;
-import org.hornetq.utils.DataConstants;
+import org.apache.activemq6.utils.DataConstants;
-import org.hornetq.utils.UTF8Util;
+import org.apache.activemq6.utils.UTF8Util;
 
 /**
  * A ChannelBufferWrapper

activemq6-commons/src/main/java/org/apache/activemq6/core/server/HornetQComponent.java

@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.core.server;
+package org.apache.activemq6.core.server;
 
 /**
  * A HornetQComponent

activemq6-commons/src/main/java/org/apache/activemq6/utils/Base64.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;

activemq6-commons/src/main/java/org/apache/activemq6/utils/ByteUtil.java

@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;

activemq6-commons/src/main/java/org/apache/activemq6/utils/ClassloadingUtil.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.net.URL;
 

activemq6-commons/src/main/java/org/apache/activemq6/utils/ConcurrentHashSet.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.util.AbstractSet;
 import java.util.Iterator;

activemq6-commons/src/main/java/org/apache/activemq6/utils/ConcurrentSet.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.util.Set;
 

activemq6-commons/src/main/java/org/apache/activemq6/utils/DataConstants.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 /**
  *

activemq6-commons/src/main/java/org/apache/activemq6/utils/DefaultSensitiveStringCodec.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.math.BigInteger;
 import java.security.InvalidKeyException;

activemq6-commons/src/main/java/org/apache/activemq6/utils/FactoryFinder.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -23,7 +23,7 @@ public class FactoryFinder
    /**
     * The strategy that the FactoryFinder uses to find load and instantiate Objects
     * can be changed out by calling the
-    * {@link org.hornetq.utils.FactoryFinder#setObjectFactory(org.hornetq.utils.FactoryFinder.ObjectFactory)}
+    * {@link org.apache.activemq6.utils.FactoryFinder#setObjectFactory(org.hornetq.utils.FactoryFinder.ObjectFactory)}
     * method with a custom implementation of ObjectFactory.
     * <p/>
     * The default ObjectFactory is typically changed out when running in a specialized container

activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQThreadFactory.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;

activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQUtilBundle.java

@@ -10,10 +10,10 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 
-import org.hornetq.api.core.HornetQIllegalStateException;
+import org.apache.activemq6.api.core.HornetQIllegalStateException;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageBundle;

activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQUtilLogger.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;

activemq6-commons/src/main/java/org/apache/activemq6/utils/PasswordMaskingUtil.java

@@ -10,15 +10,15 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.hornetq.api.core.HornetQException;
+import org.apache.activemq6.api.core.HornetQException;
-import org.hornetq.api.core.HornetQExceptionType;
+import org.apache.activemq6.api.core.HornetQExceptionType;
 
 /**
  * A PasswordMarkingUtil

activemq6-commons/src/main/java/org/apache/activemq6/utils/ReferenceCounter.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 /**
  * @author Clebert Suconic

activemq6-commons/src/main/java/org/apache/activemq6/utils/ReferenceCounterUtil.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;

activemq6-commons/src/main/java/org/apache/activemq6/utils/ReusableLatch.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.AbstractQueuedSynchronizer;

activemq6-commons/src/main/java/org/apache/activemq6/utils/SensitiveDataCodec.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.util.Map;
 

activemq6-commons/src/main/java/org/apache/activemq6/utils/TypedProperties.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.nio.ByteBuffer;
 import java.util.Collections;
@@ -20,21 +20,21 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.hornetq.api.core.HornetQBuffer;
+import org.apache.activemq6.api.core.HornetQBuffer;
-import org.hornetq.api.core.HornetQPropertyConversionException;
+import org.apache.activemq6.api.core.HornetQPropertyConversionException;
-import org.hornetq.api.core.SimpleString;
+import org.apache.activemq6.api.core.SimpleString;
 
-import static org.hornetq.utils.DataConstants.BOOLEAN;
+import static org.apache.activemq6.utils.DataConstants.BOOLEAN;
-import static org.hornetq.utils.DataConstants.BYTE;
+import static org.apache.activemq6.utils.DataConstants.BYTE;
-import static org.hornetq.utils.DataConstants.BYTES;
+import static org.apache.activemq6.utils.DataConstants.BYTES;
-import static org.hornetq.utils.DataConstants.CHAR;
+import static org.apache.activemq6.utils.DataConstants.CHAR;
-import static org.hornetq.utils.DataConstants.DOUBLE;
+import static org.apache.activemq6.utils.DataConstants.DOUBLE;
-import static org.hornetq.utils.DataConstants.FLOAT;
+import static org.apache.activemq6.utils.DataConstants.FLOAT;
-import static org.hornetq.utils.DataConstants.INT;
+import static org.apache.activemq6.utils.DataConstants.INT;
-import static org.hornetq.utils.DataConstants.LONG;
+import static org.apache.activemq6.utils.DataConstants.LONG;
-import static org.hornetq.utils.DataConstants.NULL;
+import static org.apache.activemq6.utils.DataConstants.NULL;
-import static org.hornetq.utils.DataConstants.SHORT;
+import static org.apache.activemq6.utils.DataConstants.SHORT;
-import static org.hornetq.utils.DataConstants.STRING;
+import static org.apache.activemq6.utils.DataConstants.STRING;
 
 /**
  * Property Value Conversion.

activemq6-commons/src/main/java/org/apache/activemq6/utils/UTF8Util.java

@@ -10,11 +10,11 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.lang.ref.SoftReference;
 
-import org.hornetq.api.core.HornetQBuffer;
+import org.apache.activemq6.api.core.HornetQBuffer;
 
 /**
  *

activemq6-commons/src/main/java/org/apache/activemq6/utils/UUID.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 
 /**

activemq6-commons/src/main/java/org/apache/activemq6/utils/UUIDGenerator.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.lang.reflect.Method;
 import java.net.NetworkInterface;
@@ -31,7 +31,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import org.hornetq.api.core.SimpleString;
+import org.apache.activemq6.api.core.SimpleString;
 
 public final class UUIDGenerator
 {

activemq6-commons/src/main/java/org/apache/activemq6/utils/UUIDTimer.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.util.Random;
 

activemq6-commons/src/test/java/org/apache/activemq6/utils/ByteUtilTest.java

@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import org.junit.Assert;
 import org.junit.Test;

activemq6-commons/src/test/java/org/apache/activemq6/utils/PairTest.java

@@ -10,12 +10,12 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import org.junit.Test;
 
 import org.junit.Assert;
-import org.hornetq.api.core.Pair;
+import org.apache.activemq6.api.core.Pair;
 
 
 public class PairTest extends Assert

activemq6-commons/src/test/java/org/apache/activemq6/utils/ReferenceCounterTest.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.utils;
+package org.apache.activemq6.utils;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;

activemq6-core-client/pom.xml

@@ -3,14 +3,14 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.hornetq</groupId>
+      <groupId>org.apache.activemq6</groupId>
-      <artifactId>hornetq-pom</artifactId>
+      <artifactId>activemq6-pom</artifactId>
-      <version>2.5.0-SNAPSHOT</version>
+      <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>hornetq-core-client</artifactId>
+   <artifactId>activemq6-core-client</artifactId>
    <packaging>jar</packaging>
-   <name>HornetQ Core Client</name>
+   <name>ActiveMQ6 Core Client</name>
 
    <properties>
       <hornetq.basedir>${project.basedir}/..</hornetq.basedir>
@@ -26,18 +26,18 @@
          <artifactId>jgroups</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.hornetq</groupId>
+         <groupId>org.apache.activemq6</groupId>
-         <artifactId>hornetq-commons</artifactId>
+         <artifactId>activemq6-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
      <dependency>
-        <groupId>org.hornetq</groupId>
+        <groupId>org.apache.activemq6</groupId>
-        <artifactId>hornetq-selector</artifactId>
+        <artifactId>activemq6-selector</artifactId>
         <version>${project.version}</version>
      </dependency>
       <dependency>
-         <groupId>org.hornetq</groupId>
+         <groupId>org.apache.activemq6</groupId>
-         <artifactId>hornetq-journal</artifactId>
+         <artifactId>activemq6-journal</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -136,7 +136,7 @@
                   <transformationSet>
                      <!-- Generates target/generated-sources/xslt/.../HornetQDefaultConfiguration.java
                           using this XSLT `./src/main/resources/hqDefaults.xsl`. -->
-                     <dir>../hornetq-server/src/main/resources/schema</dir>
+                     <dir>../activemq6-server/src/main/resources/schema</dir>
                      <outputDir>${project.build.directory}/generated-sources/xslt</outputDir>
                      <stylesheet>./src/main/resources/hqDefaults.xsl</stylesheet>
                      <includes>
@@ -144,7 +144,7 @@
                      </includes>
                      <fileMappers>
                         <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
-                           <targetName>./org/hornetq/api/config/HornetQDefaultConfiguration.java</targetName>
+                           <targetName>./org/apache/activemq6/api/config/HornetQDefaultConfiguration.java</targetName>
                         </fileMapper>
                      </fileMappers>
                   </transformationSet>

activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpoint.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 import java.util.concurrent.TimeUnit;
 

activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpointFactory.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 import java.io.Serializable;
 

activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpointFactoryConfiguration.java

@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 import java.io.Serializable;
 

activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastGroupConfiguration.java

@@ -10,17 +10,17 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 import java.io.Serializable;
 import java.util.List;
 
-import org.hornetq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq6.api.config.HornetQDefaultConfiguration;
 
 
 /**
  * The basic configuration used to determine how the server will broadcast members
- * This is analogous to {@link org.hornetq.api.core.DiscoveryGroupConfiguration}
+ * This is analogous to {@link org.apache.activemq6.api.core.DiscoveryGroupConfiguration}
  *
  * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
  * @author <a href="mailto:hgao@redhat.com">Howard Gao</a>

activemq6-core-client/src/main/java/org/apache/activemq6/api/core/DiscoveryGroupConfiguration.java

@@ -10,15 +10,15 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
-import org.hornetq.api.core.client.HornetQClient;
+import org.apache.activemq6.api.core.client.HornetQClient;
-import org.hornetq.utils.UUIDGenerator;
+import org.apache.activemq6.utils.UUIDGenerator;
 
 /**
  * This file represents how we are using Discovery.

activemq6-core-client/src/main/java/org/apache/activemq6/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java

@@ -11,12 +11,12 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 /**
  * This interface is needed for making a DiscoveryGroupConfiguration backward
  * compatible with version 2.2 clients. It is used to extract from new
- * {@link org.hornetq.api.core.BroadcastEndpointFactoryConfiguration} the four
+ * {@link org.apache.activemq6.api.core.BroadcastEndpointFactoryConfiguration} the four
  * UDP attributes in order to form a version 2.2 DiscoveryGroupConfiguration
  * in time of serialization.
  *

activemq6-core-client/src/main/java/org/apache/activemq6/api/core/FilterConstants.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 /**
  * Constants representing pre-defined message attributes that can be referenced in HornetQ core

activemq6-core-client/src/main/java/org/apache/activemq6/api/core/Interceptor.java

@@ -10,17 +10,17 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
-import org.hornetq.core.protocol.core.Packet;
+import org.apache.activemq6.core.protocol.core.Packet;
-import org.hornetq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq6.spi.core.protocol.RemotingConnection;
 
 /**
  * This is class is a simple way to intercepting calls on HornetQ client and servers.
  * <p>
  * To add an interceptor to HornetQ server, you have to modify the server configuration file
  * {@literal hornetq-configuration.xml}.<br>
- * To add it to a client, use {@link org.hornetq.api.core.client.ServerLocator#addIncomingInterceptor(Interceptor)}
+ * To add it to a client, use {@link org.apache.activemq6.api.core.client.ServerLocator#addIncomingInterceptor(Interceptor)}
  *
  * @author clebert.suconic@jboss.com
  * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>

activemq6-core-client/src/main/java/org/apache/activemq6/api/core/JGroupsBroadcastGroupConfiguration.java

@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 import java.net.URL;
 import java.util.ArrayList;

activemq6-core-client/src/main/java/org/apache/activemq6/api/core/Message.java

@@ -10,12 +10,12 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 import java.util.Map;
 import java.util.Set;
 
-import org.hornetq.utils.UUID;
+import org.apache.activemq6.utils.UUID;
 
 
 /**

activemq6-core-client/src/main/java/org/apache/activemq6/api/core/TransportConfiguration.java

@@ -10,16 +10,16 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.hornetq.core.client.HornetQClientMessageBundle;
+import org.apache.activemq6.core.client.HornetQClientMessageBundle;
-import org.hornetq.core.remoting.impl.TransportConfigurationUtil;
+import org.apache.activemq6.core.remoting.impl.TransportConfigurationUtil;
-import org.hornetq.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq6.core.remoting.impl.netty.TransportConstants;
-import org.hornetq.utils.UUIDGenerator;
+import org.apache.activemq6.utils.UUIDGenerator;
 
 /**
  * A TransportConfiguration is used by a client to specify connections to a server and its backup if
@@ -86,7 +86,7 @@ public class TransportConfiguration implements Serializable
    }
 
    /**
-    * Creates a TransportConfiguration with a specific name providing the class name of the {@link org.hornetq.spi.core.remoting.ConnectorFactory}
+    * Creates a TransportConfiguration with a specific name providing the class name of the {@link org.apache.activemq6.spi.core.remoting.ConnectorFactory}
     * and any parameters needed.
     *
     * @param className The class name of the ConnectorFactory
@@ -110,7 +110,7 @@ public class TransportConfiguration implements Serializable
    }
 
    /**
-    * Creates a TransportConfiguration providing the class name of the {@link org.hornetq.spi.core.remoting.ConnectorFactory}
+    * Creates a TransportConfiguration providing the class name of the {@link org.apache.activemq6.spi.core.remoting.ConnectorFactory}
     * and any parameters needed.
     *
     * @param className The class name of the ConnectorFactory
@@ -122,7 +122,7 @@ public class TransportConfiguration implements Serializable
    }
 
    /**
-    * Creates a TransportConfiguration providing the class name of the {@link org.hornetq.spi.core.remoting.ConnectorFactory}
+    * Creates a TransportConfiguration providing the class name of the {@link org.apache.activemq6.spi.core.remoting.ConnectorFactory}
     *
     * @param className The class name of the ConnectorFactory
     */

activemq6-core-client/src/main/java/org/apache/activemq6/api/core/TransportConfigurationHelper.java

@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core;
+package org.apache.activemq6.api.core;
 
 import java.util.Map;