activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [49/57] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-1 Artemis rename
Date Tue, 28 Apr 2015 16:02:54 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQPropertyConversionException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQPropertyConversionException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQPropertyConversionException.java
index 84ce12e..3437347 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQPropertyConversionException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQPropertyConversionException.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 /**
- * A PropertyConversionException is thrown by {@code org.apache.activemq.api.core.Message} methods when a
+ * A PropertyConversionException is thrown by {@code org.apache.activemq.artemis.api.core.Message} methods when a
  * property can not be converted to the expected type.
  */
 public final class ActiveMQPropertyConversionException extends RuntimeException

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQQueueExistsException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQQueueExistsException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQQueueExistsException.java
index 4c25128..a6d65db 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQQueueExistsException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQQueueExistsException.java
@@ -14,9 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.QUEUE_EXISTS;
+package org.apache.activemq.artemis.api.core;
 
 /**
  * An operation failed because a queue exists on the server.
@@ -27,11 +25,11 @@ public final class ActiveMQQueueExistsException extends ActiveMQException
 
    public ActiveMQQueueExistsException()
    {
-      super(QUEUE_EXISTS);
+      super(ActiveMQExceptionType.QUEUE_EXISTS);
    }
 
    public ActiveMQQueueExistsException(String msg)
    {
-      super(QUEUE_EXISTS, msg);
+      super(ActiveMQExceptionType.QUEUE_EXISTS, msg);
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSecurityException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSecurityException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSecurityException.java
index 47a2383..140d0c4 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSecurityException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSecurityException.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
-import static org.apache.activemq.api.core.ActiveMQExceptionType.SECURITY_EXCEPTION;
+import static org.apache.activemq.artemis.api.core.ActiveMQExceptionType.SECURITY_EXCEPTION;
 
 /**
  * A security problem occurred (authentication issues, permission issues,...)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSessionCreationException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSessionCreationException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSessionCreationException.java
index 30cad1b..fd52530 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSessionCreationException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSessionCreationException.java
@@ -14,9 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.SESSION_CREATION_REJECTED;
+package org.apache.activemq.artemis.api.core;
 
 /**
  * The creation of a session was rejected by the server (e.g. if the server is starting and has not
@@ -28,11 +26,11 @@ public final class ActiveMQSessionCreationException extends ActiveMQException
 
    public ActiveMQSessionCreationException()
    {
-      super(SESSION_CREATION_REJECTED);
+      super(ActiveMQExceptionType.SESSION_CREATION_REJECTED);
    }
 
    public ActiveMQSessionCreationException(String msg)
    {
-      super(SESSION_CREATION_REJECTED, msg);
+      super(ActiveMQExceptionType.SESSION_CREATION_REJECTED, msg);
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionOutcomeUnknownException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionOutcomeUnknownException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionOutcomeUnknownException.java
index 09d5923..f589293 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionOutcomeUnknownException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionOutcomeUnknownException.java
@@ -14,9 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.TRANSACTION_OUTCOME_UNKNOWN;
+package org.apache.activemq.artemis.api.core;
 
 /**
  * The outcome of a transaction is unknown.
@@ -27,11 +25,11 @@ public final class ActiveMQTransactionOutcomeUnknownException extends ActiveMQEx
 
    public ActiveMQTransactionOutcomeUnknownException()
    {
-      super(TRANSACTION_OUTCOME_UNKNOWN);
+      super(ActiveMQExceptionType.TRANSACTION_OUTCOME_UNKNOWN);
    }
 
    public ActiveMQTransactionOutcomeUnknownException(String msg)
    {
-      super(TRANSACTION_OUTCOME_UNKNOWN, msg);
+      super(ActiveMQExceptionType.TRANSACTION_OUTCOME_UNKNOWN, msg);
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionRolledBackException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionRolledBackException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionRolledBackException.java
index f3a9e80..7d777e2 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionRolledBackException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionRolledBackException.java
@@ -14,9 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.TRANSACTION_ROLLED_BACK;
+package org.apache.activemq.artemis.api.core;
 
 /**
  * A transaction was rolled back.
@@ -27,11 +25,11 @@ public final class ActiveMQTransactionRolledBackException extends ActiveMQExcept
 
    public ActiveMQTransactionRolledBackException()
    {
-      super(TRANSACTION_ROLLED_BACK);
+      super(ActiveMQExceptionType.TRANSACTION_ROLLED_BACK);
    }
 
    public ActiveMQTransactionRolledBackException(String msg)
    {
-      super(TRANSACTION_ROLLED_BACK, msg);
+      super(ActiveMQExceptionType.TRANSACTION_ROLLED_BACK, msg);
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnBlockedException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnBlockedException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnBlockedException.java
index 4fdce56..aab25fd 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnBlockedException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnBlockedException.java
@@ -14,9 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.UNBLOCKED;
+package org.apache.activemq.artemis.api.core;
 
 /**
  * A blocking call from a client was unblocked during failover.
@@ -27,11 +25,11 @@ public final class ActiveMQUnBlockedException extends ActiveMQException
 
    public ActiveMQUnBlockedException()
    {
-      super(UNBLOCKED);
+      super(ActiveMQExceptionType.UNBLOCKED);
    }
 
    public ActiveMQUnBlockedException(String msg)
    {
-      super(UNBLOCKED, msg);
+      super(ActiveMQExceptionType.UNBLOCKED, msg);
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java
index c513134..d8b6aa9 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java
@@ -14,9 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.UNSUPPORTED_PACKET;
+package org.apache.activemq.artemis.api.core;
 
 /**
  * A packet of unsupported type was received by ActiveMQ PacketHandler.
@@ -27,11 +25,11 @@ public final class ActiveMQUnsupportedPacketException extends ActiveMQException
 
    public ActiveMQUnsupportedPacketException()
    {
-      super(UNSUPPORTED_PACKET);
+      super(ActiveMQExceptionType.UNSUPPORTED_PACKET);
    }
 
    public ActiveMQUnsupportedPacketException(String msg)
    {
-      super(UNSUPPORTED_PACKET, msg);
+      super(ActiveMQExceptionType.UNSUPPORTED_PACKET, msg);
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/Pair.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/Pair.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/Pair.java
index 098643c..784cae1 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/Pair.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/Pair.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 import java.io.Serializable;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
index eb3d16d..3defc73 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.utils.DataConstants;
+import org.apache.activemq.artemis.utils.DataConstants;
 
 /**
  * A simple String class that can store all characters, and stores as simple {@code byte[]}, this

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java
index 50c19d1..d742f35 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.buffers.impl;
+package org.apache.activemq.artemis.core.buffers.impl;
 
 import java.nio.ByteBuffer;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.utils.DataConstants;
-import org.apache.activemq.utils.UTF8Util;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.utils.DataConstants;
+import org.apache.activemq.artemis.utils.UTF8Util;
 
 public class ChannelBufferWrapper implements ActiveMQBuffer
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQComponent.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQComponent.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQComponent.java
index 0df80f5..e4466a5 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQComponent.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQComponent.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.server;
+package org.apache.activemq.artemis.core.server;
 
 public interface ActiveMQComponent
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
index be1abe5..6be2ae4 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.logs;
+package org.apache.activemq.artemis.logs;
 
 
-import org.apache.activemq.api.core.ActiveMQIllegalStateException;
+import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageBundle;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java
index 00153a5..81e1b31 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.logs;
+package org.apache.activemq.artemis.logs;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
index e7dd076..1566317 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.logs;
+package org.apache.activemq.artemis.logs;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadFactory.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadFactory.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadFactory.java
index 23a84db..193ee6f 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadFactory.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.security.AccessControlContext;
 import java.security.AccessController;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java
index 2fb362b..9d2481a 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java
@@ -9,7 +9,7 @@
  * release to you under whatever reasonable license you desire: MIT, BSD, GPL, whatever."
  *
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
index b09de3a..4130c36 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
index 7b5abde..e5cd954 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.net.URL;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java
index 0bd93a7..a5f19b4 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.util.AbstractSet;
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentSet.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentSet.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentSet.java
index 6c5c533..1d038cc 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentSet.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentSet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.util.Set;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DataConstants.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DataConstants.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DataConstants.java
index 8e659bb..a15c542 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DataConstants.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DataConstants.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 public final class DataConstants
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
index fa0884f..508d5a4 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.math.BigInteger;
 import java.security.InvalidKeyException;
@@ -107,7 +107,7 @@ public class DefaultSensitiveStringCodec implements SensitiveDataCodec<String>
    {
       if (args.length != 1)
       {
-         System.err.println("Use: java -cp <classPath> org.apache.activemq.utils.DefaultSensitiveStringCodec password-to-encode");
+         System.err.println("Use: java -cp <classPath> org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec password-to-encode");
          System.err.println("Error: no password on the args");
          System.exit(-1);
       }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java
index 89f4b1e..b85bf66 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
index 271c8d4..937cc1f 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.logs.ActiveMQUtilBundle;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.logs.ActiveMQUtilBundle;
 
 public class PasswordMaskingUtil
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounter.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounter.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounter.java
index 9c546ff..0b0cf02 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounter.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 public interface ReferenceCounter
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounterUtil.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounterUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounterUtil.java
index e42ab2c..d47cc4d 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounterUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounterUtil.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java
index 22c0938..117386a 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.AbstractQueuedSynchronizer;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SensitiveDataCodec.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SensitiveDataCodec.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SensitiveDataCodec.java
index 15da191..4f16a28 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SensitiveDataCodec.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SensitiveDataCodec.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.util.Map;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TypedProperties.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TypedProperties.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TypedProperties.java
index 098c5c5..20b23b5 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TypedProperties.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TypedProperties.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.nio.ByteBuffer;
 import java.util.Collections;
@@ -24,22 +24,22 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQPropertyConversionException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.logs.ActiveMQUtilBundle;
-
-import static org.apache.activemq.utils.DataConstants.BOOLEAN;
-import static org.apache.activemq.utils.DataConstants.BYTE;
-import static org.apache.activemq.utils.DataConstants.BYTES;
-import static org.apache.activemq.utils.DataConstants.CHAR;
-import static org.apache.activemq.utils.DataConstants.DOUBLE;
-import static org.apache.activemq.utils.DataConstants.FLOAT;
-import static org.apache.activemq.utils.DataConstants.INT;
-import static org.apache.activemq.utils.DataConstants.LONG;
-import static org.apache.activemq.utils.DataConstants.NULL;
-import static org.apache.activemq.utils.DataConstants.SHORT;
-import static org.apache.activemq.utils.DataConstants.STRING;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.logs.ActiveMQUtilBundle;
+
+import static org.apache.activemq.artemis.utils.DataConstants.BOOLEAN;
+import static org.apache.activemq.artemis.utils.DataConstants.BYTE;
+import static org.apache.activemq.artemis.utils.DataConstants.BYTES;
+import static org.apache.activemq.artemis.utils.DataConstants.CHAR;
+import static org.apache.activemq.artemis.utils.DataConstants.DOUBLE;
+import static org.apache.activemq.artemis.utils.DataConstants.FLOAT;
+import static org.apache.activemq.artemis.utils.DataConstants.INT;
+import static org.apache.activemq.artemis.utils.DataConstants.LONG;
+import static org.apache.activemq.artemis.utils.DataConstants.NULL;
+import static org.apache.activemq.artemis.utils.DataConstants.SHORT;
+import static org.apache.activemq.artemis.utils.DataConstants.STRING;
 
 /**
  * Property Value Conversion.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java
index fe6ea61..4b1811b 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.lang.ref.SoftReference;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.logs.ActiveMQUtilBundle;
-import org.apache.activemq.logs.ActiveMQUtilLogger;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.logs.ActiveMQUtilBundle;
+import org.apache.activemq.artemis.logs.ActiveMQUtilLogger;
 
 /**
  * A UTF8Util

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUID.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUID.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUID.java
index 73bd158..3de4642 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUID.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUID.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
index cfcaa55..b447312 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.lang.reflect.Method;
 import java.net.NetworkInterface;
@@ -32,8 +32,8 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.logs.ActiveMQUtilLogger;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.logs.ActiveMQUtilLogger;
 
 public final class UUIDGenerator
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java
index a404bb6..0c28078 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.util.Random;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/SchemaConstants.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/SchemaConstants.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/SchemaConstants.java
index 04a8f69..53c2378 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/SchemaConstants.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/SchemaConstants.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils.uri;
+package org.apache.activemq.artemis.utils.uri;
 
 public class SchemaConstants
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URIFactory.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URIFactory.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URIFactory.java
index 7191cb6..96c2069 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URIFactory.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URIFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.utils.uri;
+package org.apache.activemq.artemis.utils.uri;
 
 import java.net.URI;
 import java.net.URISyntaxException;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java
index 5ab7fe0..6159518 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils.uri;
+package org.apache.activemq.artemis.utils.uri;
 
 import java.beans.PropertyDescriptor;
 import java.io.UnsupportedEncodingException;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java
index cf533d5..5a7096c 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import org.junit.Assert;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/PairTest.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/PairTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/PairTest.java
index c5eb34a..8915c8c 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/PairTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/PairTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import org.junit.Test;
 
 import org.junit.Assert;
-import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.artemis.api.core.Pair;
 
 
 public class PairTest extends Assert

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java
index 2da9a71..92730e2 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/URIParserTest.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/URIParserTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/URIParserTest.java
index 7ef5498..c89f5e9 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/URIParserTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/URIParserTest.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.utils;
+package org.apache.activemq.artemis.utils;
 
-import org.apache.activemq.utils.uri.URIFactory;
-import org.apache.activemq.utils.uri.URISchema;
+import org.apache.activemq.artemis.utils.uri.URIFactory;
+import org.apache.activemq.artemis.utils.uri.URISchema;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-core-client/pom.xml b/artemis-core-client/pom.xml
index 5f17cee..4a6a62b 100644
--- a/artemis-core-client/pom.xml
+++ b/artemis-core-client/pom.xml
@@ -19,11 +19,11 @@
 
    <parent>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-pom</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <artifactId>artemis-pom</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq-core-client</artifactId>
+   <artifactId>artemis-core-client</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis Core Client</name>
 
@@ -44,17 +44,17 @@
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-commons</artifactId>
+         <artifactId>artemis-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
      <dependency>
         <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-selector</artifactId>
+        <artifactId>artemis-selector</artifactId>
         <version>${project.version}</version>
      </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-journal</artifactId>
+         <artifactId>artemis-journal</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -84,7 +84,7 @@
                      <maxmemory>512m</maxmemory>
                      <quiet>false</quiet>
                      <aggregate>true</aggregate>
-                     <excludePackageNames>org.apache.activemq.core:org.apache.activemq.utils</excludePackageNames>
+                     <excludePackageNames>org.apache.activemq.artemis.core:org.apache.activemq.artemis.utils</excludePackageNames>
                   </configuration>
                   <executions>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index cea7633..e5770e1 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.config;
+package org.apache.activemq.artemis.api.config;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.journal.impl.JournalConstants;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.journal.impl.JournalConstants;
 
 /**
  * Default values of ActiveMQ configuration parameters.
@@ -309,10 +309,6 @@ public final class ActiveMQDefaultConfiguration
    // Once the bridge has received this many bytes, it sends a confirmation
    private static int DEFAULT_BRIDGE_CONFIRMATION_WINDOW_SIZE = 1048576;
 
-   // Producer flow control is disabled by default on the bridge
-   // You probably need to enable this if you use lots of huge messages
-   private static int DEFAULT_BRIDGE_PRODUCER_WINDOW_SIZE = -1;
-
    // Upon reconnection this configures the number of time the same node on the topology will be retried before reseting the server locator and using the initial connectors
    private static int DEFAULT_BRIDGE_CONNECT_SAME_NODE = 10;
 
@@ -874,16 +870,6 @@ public final class ActiveMQDefaultConfiguration
       return DEFAULT_BRIDGE_CONFIRMATION_WINDOW_SIZE;
    }
 
-
-   /**
-    * This default is used for both bridge and cluster connections (since they both translate to bridges) *
-    * @return
-    */
-   public static int getDefaultBridgeProducerWindowSize()
-   {
-      return DEFAULT_BRIDGE_PRODUCER_WINDOW_SIZE;
-   }
-
    /**
     * Upon reconnection this configures the number of time the same node on the topology will be retried before reseting the server locator and using the initial connectors
     */

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BaseInterceptor.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BaseInterceptor.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BaseInterceptor.java
index 57c788b..55cc504 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BaseInterceptor.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BaseInterceptor.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 public interface BaseInterceptor<P>
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastEndpoint.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastEndpoint.java
index 6400697..b434360 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastEndpoint.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastEndpoint.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 import java.util.concurrent.TimeUnit;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastEndpointFactory.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastEndpointFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastEndpointFactory.java
index 8fbe217..922c1a9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastEndpointFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastEndpointFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastGroupConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastGroupConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastGroupConfiguration.java
index 206f57f..3916341 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastGroupConfiguration.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastGroupConfiguration.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 import java.io.Serializable;
 import java.util.List;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 
 
 /**
  * The basic configuration used to determine how the server will broadcast members
- * This is analogous to {@link org.apache.activemq.api.core.DiscoveryGroupConfiguration}
+ * This is analogous to {@link DiscoveryGroupConfiguration}
  */
 public final class BroadcastGroupConfiguration implements Serializable
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java
index b0c4dea..5be1d6d 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 import org.jgroups.JChannel;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/DiscoveryGroupConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/DiscoveryGroupConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/DiscoveryGroupConfiguration.java
index 51633ca..fdce25a 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/DiscoveryGroupConfiguration.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/DiscoveryGroupConfiguration.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 import java.io.Serializable;
 
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 
 /**
  * This file represents how we are using Discovery.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java
index 959235b..25c862b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 /**
  * Constants representing pre-defined message attributes that can be referenced in ActiveMQ core

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
index 7cfee0b..adea81b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
-import org.apache.activemq.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
 
 /**
  * This is class is a simple way to intercepting calls on ActiveMQ client and servers.
  * <p>
  * To add an interceptor to ActiveMQ server, you have to modify the server configuration file
  * {@literal activemq-configuration.xml}.<br>
- * To add it to a client, use {@link org.apache.activemq.api.core.client.ServerLocator#addIncomingInterceptor(Interceptor)}
+ * To add it to a client, use {@link org.apache.activemq.artemis.api.core.client.ServerLocator#addIncomingInterceptor(Interceptor)}
  */
 public interface Interceptor extends BaseInterceptor<Packet>
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
index b0bec17..ea750c9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 import org.jgroups.JChannel;
 import org.jgroups.ReceiverAdapter;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsChannelBroadcastEndpoint.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsChannelBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsChannelBroadcastEndpoint.java
index a73a62d..a4c48ac 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsChannelBroadcastEndpoint.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsChannelBroadcastEndpoint.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 import org.jgroups.JChannel;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java
index 863e51c..d6181a0 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 import org.jgroups.JChannel;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpointFactory.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpointFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpointFactory.java
index e491253..d0676cf 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpointFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpointFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 public class JGroupsFileBroadcastEndpointFactory implements BroadcastEndpointFactory
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java
index 4875d9a..98f5ee9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 import org.jgroups.JChannel;
 import org.jgroups.conf.PlainConfigurator;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpointFactory.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpointFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpointFactory.java
index 87295e2..e2f1f20 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpointFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpointFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 public class JGroupsPropertiesBroadcastEndpointFactory implements BroadcastEndpointFactory
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
index 536d3de..a159760 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.activemq.utils.UUID;
+import org.apache.activemq.artemis.utils.UUID;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
index 17b3d60..8d2fdb0 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.core.client.ActiveMQClientMessageBundle;
-import org.apache.activemq.core.remoting.impl.TransportConfigurationUtil;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle;
+import org.apache.activemq.artemis.core.remoting.impl.TransportConfigurationUtil;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 
 /**
  * A TransportConfiguration is used by a client to specify connections to a server and its backup if
@@ -89,7 +89,7 @@ public class TransportConfiguration implements Serializable
    }
 
    /**
-    * Creates a TransportConfiguration with a specific name providing the class name of the {@link org.apache.activemq.spi.core.remoting.ConnectorFactory}
+    * Creates a TransportConfiguration with a specific name providing the class name of the {@link org.apache.activemq.artemis.spi.core.remoting.ConnectorFactory}
     * and any parameters needed.
     *
     * @param className The class name of the ConnectorFactory
@@ -113,7 +113,7 @@ public class TransportConfiguration implements Serializable
    }
 
    /**
-    * Creates a TransportConfiguration providing the class name of the {@link org.apache.activemq.spi.core.remoting.ConnectorFactory}
+    * Creates a TransportConfiguration providing the class name of the {@link org.apache.activemq.artemis.spi.core.remoting.ConnectorFactory}
     * and any parameters needed.
     *
     * @param className The class name of the ConnectorFactory
@@ -125,7 +125,7 @@ public class TransportConfiguration implements Serializable
    }
 
    /**
-    * Creates a TransportConfiguration providing the class name of the {@link org.apache.activemq.spi.core.remoting.ConnectorFactory}
+    * Creates a TransportConfiguration providing the class name of the {@link org.apache.activemq.artemis.spi.core.remoting.ConnectorFactory}
     *
     * @param className The class name of the ConnectorFactory
     */

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfigurationHelper.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfigurationHelper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfigurationHelper.java
index 63f9798..19f64b1 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfigurationHelper.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfigurationHelper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 import java.util.Map;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java
index 7407805..fab863c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -26,13 +26,13 @@ import java.net.InetSocketAddress;
 import java.net.MulticastSocket;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.core.client.ActiveMQClientLogger;
+import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
 
 
 /**
  * The configuration used to determine how the server will broadcast members.
  * <p>
- * This is analogous to {@link org.apache.activemq.api.core.DiscoveryGroupConfiguration}
+ * This is analogous to {@link DiscoveryGroupConfiguration}
  */
 public final class UDPBroadcastEndpointFactory implements BroadcastEndpointFactory
 {
@@ -103,7 +103,7 @@ public final class UDPBroadcastEndpointFactory implements BroadcastEndpointFacto
 
    /**
     * <p> This is the member discovery implementation using direct UDP. It was extracted as a refactoring from
-    * {@link org.apache.activemq.core.cluster.DiscoveryGroup}</p>
+    * {@link org.apache.activemq.artemis.core.cluster.DiscoveryGroup}</p>
     */
    private static class UDPBroadcastEndpoint implements BroadcastEndpoint
    {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
index 229f000..fb11b88 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
-
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy;
-import org.apache.activemq.core.client.impl.ServerLocatorImpl;
-import org.apache.activemq.uri.ServerLocatorParser;
+package org.apache.activemq.artemis.api.core.client;
+
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl;
+import org.apache.activemq.artemis.uri.ServerLocatorParser;
 
 import java.net.URI;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java
index 4a64512..91c8e88 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
+package org.apache.activemq.artemis.api.core.client;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.spi.core.remoting.ConsumerContext;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.spi.core.remoting.ConsumerContext;
 
 /**
  * A ClientConsumer receives messages from ActiveMQ queues.
@@ -48,7 +48,7 @@ public interface ClientConsumer extends AutoCloseable
     * <p>
     * Calling this method on a closed consumer will throw a ActiveMQException.
     * @return a ClientMessage
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while waiting to receive a message
+    * @throws ActiveMQException if an exception occurs while waiting to receive a message
     */
    ClientMessage receive() throws ActiveMQException;
 
@@ -60,7 +60,7 @@ public interface ClientConsumer extends AutoCloseable
     * Calling this method on a closed consumer will throw a ActiveMQException.
     * @param timeout time (in milliseconds) to wait to receive a message
     * @return a message or {@code null} if the time out expired
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while waiting to receive a message
+    * @throws ActiveMQException if an exception occurs while waiting to receive a message
     */
    ClientMessage receive(long timeout) throws ActiveMQException;
 
@@ -76,7 +76,7 @@ public interface ClientConsumer extends AutoCloseable
     * <p>
     * Calling this method on a closed consumer will throw a ActiveMQException.
     * @return a message or {@code null} if there are no messages in the queue for this consumer
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while waiting to receive a message
+    * @throws ActiveMQException if an exception occurs while waiting to receive a message
     */
    ClientMessage receiveImmediate() throws ActiveMQException;
 
@@ -85,7 +85,7 @@ public interface ClientConsumer extends AutoCloseable
     * <p>
     * Calling this method on a closed consumer will throw a ActiveMQException.
     * @return the MessageHandler associated to this consumer or {@code null}
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while getting the MessageHandler
+    * @throws ActiveMQException if an exception occurs while getting the MessageHandler
     */
    MessageHandler getMessageHandler() throws ActiveMQException;
 
@@ -94,7 +94,7 @@ public interface ClientConsumer extends AutoCloseable
     * <p>
     * Calling this method on a closed consumer will throw a ActiveMQException.
     * @param handler a MessageHandler
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while setting the MessageHandler
+    * @throws ActiveMQException if an exception occurs while setting the MessageHandler
     */
    ClientConsumer setMessageHandler(MessageHandler handler) throws ActiveMQException;
 
@@ -103,7 +103,7 @@ public interface ClientConsumer extends AutoCloseable
     * <p>
     * Once this consumer is closed, it can not receive messages, whether synchronously or
     * asynchronously.
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     */
    void close() throws ActiveMQException;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
index f80adfb..a487190 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
+package org.apache.activemq.artemis.api.core.client;
 
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.Message;
 
 /**
  *
@@ -49,7 +49,7 @@ public interface ClientMessage extends Message
     * If the session responsible to acknowledge this message has {@code autoCommitAcks} set to
     * {@code true}, the transaction will automatically commit the current transaction. Otherwise,
     * this acknowledgement will not be committed until the client commits the session transaction.
-    * @throws org.apache.activemq.api.core.ActiveMQException if an error occurred while acknowledging the message.
+    * @throws ActiveMQException if an error occurred while acknowledging the message.
     * @see ClientSession#isAutoCommitAcks()
     */
    ClientMessage acknowledge() throws ActiveMQException;
@@ -60,7 +60,7 @@ public interface ClientMessage extends Message
     * If the session responsible to acknowledge this message has {@code autoCommitAcks} set to
     * {@code true}, the transaction will automatically commit the current transaction. Otherwise,
     * this acknowledgement will not be committed until the client commits the session transaction.
-    * @throws org.apache.activemq.api.core.ActiveMQException if an error occurred while acknowledging the message.
+    * @throws ActiveMQException if an error occurred while acknowledging the message.
     * @see ClientSession#isAutoCommitAcks()
     */
    ClientMessage individualAcknowledge() throws ActiveMQException;
@@ -71,7 +71,7 @@ public interface ClientMessage extends Message
     * The use case for this is to make sure there won't be an exception while getting the buffer.
     * Using getBodyBuffer directly would have the same effect but you could get a Runtime non checked Exception
     * instead
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     */
    void checkCompletion() throws ActiveMQException;
 
@@ -85,7 +85,7 @@ public interface ClientMessage extends Message
     * <br>
     * This method is used when consuming large messages
     *
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     * @return this ClientMessage
     */
    ClientMessage setOutputStream(OutputStream out) throws ActiveMQException;
@@ -95,7 +95,7 @@ public interface ClientMessage extends Message
     * It will block until the entire content is transferred to the OutputStream.
     * <br>
     *
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     */
    void saveToOutputStream(OutputStream out) throws ActiveMQException;
 
@@ -106,7 +106,7 @@ public interface ClientMessage extends Message
     *
     * @param timeMilliseconds - 0 means wait forever
     * @return true if it reached the end
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     */
    boolean waitOutputStreamCompletion(long timeMilliseconds) throws ActiveMQException;
 
@@ -120,112 +120,112 @@ public interface ClientMessage extends Message
 
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putBooleanProperty(SimpleString key, boolean value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putBooleanProperty(String key, boolean value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putByteProperty(SimpleString key, byte value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putByteProperty(String key, byte value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putBytesProperty(SimpleString key, byte[] value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putBytesProperty(String key, byte[] value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putShortProperty(SimpleString key, short value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putShortProperty(String key, short value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putCharProperty(SimpleString key, char value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putCharProperty(String key, char value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putIntProperty(SimpleString key, int value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putIntProperty(String key, int value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putLongProperty(SimpleString key, long value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putLongProperty(String key, long value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putFloatProperty(SimpleString key, float value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putFloatProperty(String key, float value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putDoubleProperty(SimpleString key, double value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putDoubleProperty(String key, double value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putStringProperty(SimpleString key, SimpleString value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage putStringProperty(String key, String value);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage writeBodyBufferBytes(byte[] bytes);
 
    /**
-    * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API
+    * Overridden from {@link Message} to enable fluent API
     */
    ClientMessage writeBodyBufferString(String string);
 


Mime
View raw message